From: 蔡枫 <cf@rock-chips.com>
Date: Tue, 9 Aug 2011 13:43:15 +0000 (+0800)
Subject: Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
X-Git-Tag: firefly_0821_release~9772^2~18^2~23
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=abe721639230bad3a444ba1db352c6fcbfce01fe;p=firefly-linux-kernel-4.4.55.git

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

abe721639230bad3a444ba1db352c6fcbfce01fe