From: 蔡枫 <cf@rock-chips.com>
Date: Fri, 12 Aug 2011 05:13:10 +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~7
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=32687f5c547c46796017a7a0cb19e9b1b9f5129c;p=firefly-linux-kernel-4.4.55.git

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

32687f5c547c46796017a7a0cb19e9b1b9f5129c