From: xbw <xbw@rock-chips.com>
Date: Thu, 22 Sep 2011 04:37:02 +0000 (+0800)
Subject: Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
X-Git-Tag: firefly_0821_release~9767^2~12^2~2
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=1ec81553a0858a8136eae6185f70fb05cb3352bd;p=firefly-linux-kernel-4.4.55.git

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

1ec81553a0858a8136eae6185f70fb05cb3352bd