From: JacobChen <cc@rock-chips.com>
Date: Mon, 5 Dec 2011 06:58:58 +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~9732
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8c379ae40c38f7c9735b013960638383802a1997;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
---

8c379ae40c38f7c9735b013960638383802a1997