From: ddl <ddl@rockchip.com>
Date: Tue, 2 Aug 2011 07:24:14 +0000 (+0800)
Subject: Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
X-Git-Tag: firefly_0821_release~9775^2~3^2~24^2~3
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0ff4b1ef3570b483ef7a715d6496ee4e920dd3a7;p=firefly-linux-kernel-4.4.55.git

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

0ff4b1ef3570b483ef7a715d6496ee4e920dd3a7