From: xbw <xbw@rock-chips.com>
Date: Thu, 15 Sep 2011 06:59:07 +0000 (+0800)
Subject: Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
X-Git-Tag: firefly_0821_release~9767^2~26
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b05d110f3b5003cee7c223b2f7cebd5cab5a3c8d;p=firefly-linux-kernel-4.4.55.git

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

b05d110f3b5003cee7c223b2f7cebd5cab5a3c8d