From: 蔡枫 <cf@rock-chips.com>
Date: Fri, 22 Apr 2011 01:47:34 +0000 (+0800)
Subject: Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
X-Git-Tag: firefly_0821_release~10435^2~2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b639c17ab0b82ad703fe7ec417cbe78a08fbb725;p=firefly-linux-kernel-4.4.55.git

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

b639c17ab0b82ad703fe7ec417cbe78a08fbb725