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

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

2c1af0340fd4782a3a124dd580b88cf03323c289