From: cmc <cmc@rock-chips.com>
Date: Tue, 7 Dec 2010 08:10:09 +0000 (+0800)
Subject: Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
X-Git-Tag: firefly_0821_release~10985
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d1e7f16f43923f72a7a677c221ae654b0301024d;p=firefly-linux-kernel-4.4.55.git

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

d1e7f16f43923f72a7a677c221ae654b0301024d
diff --cc arch/arm/mach-rk29/board-rk29sdk.c
index 26ecad0789f6,a2dd20a54da8..1727382932fd
mode 100755,100644..100644
--- a/arch/arm/mach-rk29/board-rk29sdk.c
+++ b/arch/arm/mach-rk29/board-rk29sdk.c