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

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

1a487a2d6fe9aff9fd61d48a6829e5066f2049cf