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

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

7a31aa267c3ab95163c036483d3e415e9c23d010
diff --cc arch/arm/mach-rk29/board-rk29sdk.c
index bbd5cc7aa8e3,2d45b3003b94..8269601991f7
mode 100755,100644..100755
--- a/arch/arm/mach-rk29/board-rk29sdk.c
+++ b/arch/arm/mach-rk29/board-rk29sdk.c