From: 蔡枫 <cf@rock-chips.com>
Date: Mon, 4 Jul 2011 12:27:58 +0000 (+0800)
Subject: Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
X-Git-Tag: firefly_0821_release~10144
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=d1de99718579dbedc7ad56fc1a320bc55acdc014;p=firefly-linux-kernel-4.4.55.git

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

d1de99718579dbedc7ad56fc1a320bc55acdc014