From: yangkai <yk@rock-chips.com>
Date: Tue, 20 Dec 2011 03:52:48 +0000 (+0800)
Subject: Merge branch 'develop-3.0' of 10.10.10.29:/home/rockchip/kernel into develop-3.0
X-Git-Tag: firefly_0821_release~9710
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4e09869c17005adb13a318192fd04949b736a055;p=firefly-linux-kernel-4.4.55.git

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

4e09869c17005adb13a318192fd04949b736a055