From: cwz <cwz@rockchips.com>
Date: Wed, 20 Apr 2011 02:47:51 +0000 (-0700)
Subject: Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
X-Git-Tag: firefly_0821_release~10444
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fa54e1894528c6272deceacecb2e5167603326df;p=firefly-linux-kernel-4.4.55.git

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

fa54e1894528c6272deceacecb2e5167603326df