From: JacobChen <cc@rock-chips.com>
Date: Thu, 1 Dec 2011 03:30:34 +0000 (+0800)
Subject: Merge branch 'develop-3.0' of ssh://10.10.10.29/home/rockchip/kernel into develop-3.0
X-Git-Tag: firefly_0821_release~9733
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=0848c99bf195f46ac10cca7d435544f232812aa8;p=firefly-linux-kernel-4.4.55.git

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

0848c99bf195f46ac10cca7d435544f232812aa8