From: xbw <xbw@rock-chips.com>
Date: Tue, 20 Sep 2011 08:32:38 +0000 (+0800)
Subject: Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
X-Git-Tag: firefly_0821_release~9767^2~25
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=011292810e55858cb60b33aba4f8adef231a3823;p=firefly-linux-kernel-4.4.55.git

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

011292810e55858cb60b33aba4f8adef231a3823