From: cmc <cmc@rock-chips.com>
Date: Mon, 29 Nov 2010 07:21:29 +0000 (+0800)
Subject: Merge branch 'develop' of 192.168.1.29:/home/rockchip/kernel into develop
X-Git-Tag: firefly_0821_release~11020
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7cd165487e9f8416898fab3d7a38a1ae1c3338b0;p=firefly-linux-kernel-4.4.55.git

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

7cd165487e9f8416898fab3d7a38a1ae1c3338b0
diff --cc arch/arm/mach-rk29/board-rk29sdk.c
index 821046796ba8,e247da0c4327..925c0e44d01f
mode 100755,100644..100644
--- a/arch/arm/mach-rk29/board-rk29sdk.c
+++ b/arch/arm/mach-rk29/board-rk29sdk.c