From: yxj <yxj@yxj-desktop.(none)>
Date: Fri, 19 Aug 2011 03:24:48 +0000 (+0800)
Subject: Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
X-Git-Tag: firefly_0821_release~9772^2~18
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=7a921172610f22fd8657a6359f7e29e4a1e2b25c;p=firefly-linux-kernel-4.4.55.git

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

7a921172610f22fd8657a6359f7e29e4a1e2b25c