From: CMY <cmy@rock-chips.com>
Date: Mon, 18 Jul 2011 10:02:10 +0000 (+0800)
Subject: Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
X-Git-Tag: firefly_0821_release~10119
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7c8457e31b6f7a88d46f378ac9e2e9e457e393b4;p=firefly-linux-kernel-4.4.55.git

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

7c8457e31b6f7a88d46f378ac9e2e9e457e393b4