From: 蔡枫 <cf@rock-chips.com>
Date: Wed, 27 Jul 2011 03:29:58 +0000 (+0800)
Subject: Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
X-Git-Tag: firefly_0821_release~9775^2~3^2~30
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=519dc1b0bb19afde6ec06eae5bb2fc3f45d1df05;p=firefly-linux-kernel-4.4.55.git

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

519dc1b0bb19afde6ec06eae5bb2fc3f45d1df05