From: xbw <xbw@rock-chips.com>
Date: Thu, 15 Dec 2011 03:06:19 +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^2~18
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c01cc9308ea0a5c3ef0d8c62b6763deee94b3900;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
---

c01cc9308ea0a5c3ef0d8c62b6763deee94b3900