From: xbw <xbw@rock-chips.com>
Date: Thu, 22 Sep 2011 05:19:11 +0000 (+0800)
Subject: Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
X-Git-Tag: firefly_0821_release~9767^2~12^2
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=42630d2ac8868b6972fe7ef5a6fe21622bc031cf;p=firefly-linux-kernel-4.4.55.git

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

42630d2ac8868b6972fe7ef5a6fe21622bc031cf
diff --cc arch/arm/mach-rk29/include/mach/board.h
index c5c222428923,e9745576374e..039cc173cb9b
mode 100755,100644..100755
--- a/arch/arm/mach-rk29/include/mach/board.h
+++ b/arch/arm/mach-rk29/include/mach/board.h