From: 蔡枫 <cf@rock-chips.com>
Date: Wed, 17 Aug 2011 04:27:24 +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~2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4b6ee5652ec803755e0683750de108ca7f3cb99d;p=firefly-linux-kernel-4.4.55.git

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

4b6ee5652ec803755e0683750de108ca7f3cb99d