From: root <root@rockchip-MID.(none)>
Date: Tue, 1 Mar 2011 12:39:34 +0000 (+0800)
Subject: Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
X-Git-Tag: firefly_0821_release~10729
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=af1411f7c5443d97fb76b2fa07728509470528df;p=firefly-linux-kernel-4.4.55.git

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

af1411f7c5443d97fb76b2fa07728509470528df