From: 蔡枫 <cf@rock-chips.com>
Date: Fri, 6 May 2011 05:39:40 +0000 (+0800)
Subject: Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
X-Git-Tag: firefly_0821_release~10352
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9a1bcc2cac8c25866a14a3c4f4a78f85b3ba1156;p=firefly-linux-kernel-4.4.55.git

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

9a1bcc2cac8c25866a14a3c4f4a78f85b3ba1156