From: lhh <lhh@rock-chips.com>
Date: Fri, 24 Dec 2010 03:33:23 +0000 (+0800)
Subject: Merge branch 'develop' of lhh@10.10.10.29:/home/rockchip/kernel into develop
X-Git-Tag: firefly_0821_release~10894
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e79f6819eaa00843737fc01890c187662202661e;p=firefly-linux-kernel-4.4.55.git

Merge branch 'develop' of lhh@10.10.10.29:/home/rockchip/kernel into develop
---

e79f6819eaa00843737fc01890c187662202661e