From: 蔡枫 <cf@rock-chips.com>
Date: Fri, 24 Jun 2011 14:40:11 +0000 (+0800)
Subject: Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
X-Git-Tag: firefly_0821_release~10171
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=90b7169811cd406fd8567bba274e27eba00b885e;p=firefly-linux-kernel-4.4.55.git

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

90b7169811cd406fd8567bba274e27eba00b885e