From: cwz <cwz@rockchips.com>
Date: Fri, 22 Apr 2011 02:45:57 +0000 (-0700)
Subject: Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
X-Git-Tag: firefly_0821_release~10435
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=3b25048ffc3fbfe3e0e7e7f857f7e3cc77e14d41;p=firefly-linux-kernel-4.4.55.git

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

3b25048ffc3fbfe3e0e7e7f857f7e3cc77e14d41