From: 蔡枫 <cf@rock-chips.com>
Date: Thu, 11 Aug 2011 06:37:37 +0000 (+0800)
Subject: Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
X-Git-Tag: firefly_0821_release~9772^2~20^2~14
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=aaf6247546ecba88731e071c29dcd135709ae633;p=firefly-linux-kernel-4.4.55.git

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

aaf6247546ecba88731e071c29dcd135709ae633