From: yangkai <yangkai@ubuntu-fs>
Date: Mon, 11 Apr 2011 03:40:55 +0000 (+0800)
Subject: Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
X-Git-Tag: firefly_0821_release~10523
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=03445612966b57884c3e9fcdfd5c60a0c04c0901;p=firefly-linux-kernel-4.4.55.git

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

03445612966b57884c3e9fcdfd5c60a0c04c0901