From: yangkai <yk@rock-chips.com>
Date: Tue, 31 Jul 2012 02:41:29 +0000 (+0800)
Subject: Merge remote branch 'wlf/develop-3.0-rk2928' into develop-3.0-rk2928
X-Git-Tag: firefly_0821_release~8912^2~57
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5c6d7432003aa4a96af3d2d14ebf2f3f9a0dd3dd;p=firefly-linux-kernel-4.4.55.git

Merge remote branch 'wlf/develop-3.0-rk2928' into develop-3.0-rk2928
---

5c6d7432003aa4a96af3d2d14ebf2f3f9a0dd3dd