From: cwz <cwz@rockchips.com>
Date: Wed, 3 Aug 2011 08:10:48 +0000 (-0700)
Subject: Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
X-Git-Tag: firefly_0821_release~9775^2~3^2~13
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6cfd80746f3dca2ea70c689aeda0c9e263d8e4ea;p=firefly-linux-kernel-4.4.55.git

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

6cfd80746f3dca2ea70c689aeda0c9e263d8e4ea