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

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

a214405302a15e24ca7fbdd8efe452224b7443fe