From: 蔡枫 <cf@rock-chips.com>
Date: Tue, 28 Jun 2011 08:16:19 +0000 (+0800)
Subject: Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
X-Git-Tag: firefly_0821_release~10164
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=5d00576a6ec320710fbd9ae0e1b9debe9a863467;p=firefly-linux-kernel-4.4.55.git

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

5d00576a6ec320710fbd9ae0e1b9debe9a863467