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

author xbw <xbw@rock-chips.com>

Thu, 22 Sep 2011 05:19:11 +0000 (13:19 +0800)

committer xbw <xbw@rock-chips.com>

Thu, 22 Sep 2011 05:19:11 +0000 (13:19 +0800)
author xbw <xbw@rock-chips.com>
Thu, 22 Sep 2011 05:19:11 +0000 (13:19 +0800)
committer xbw <xbw@rock-chips.com>
Thu, 22 Sep 2011 05:19:11 +0000 (13:19 +0800)
diff --cc arch/arm/mach-rk29/include/mach/board.h

index c5c2224289234b82170c76a81bbb5ad5ceb88621,e9745576374ec1d448c0a3e564e81fcafb8150f8..039cc173cb9b300e2f3eee610479a29c29ea7eef

mode 100755,100644..100755
--- 1/arch/arm/mach-rk29/include/mach/board.h
--- 2/arch/arm/mach-rk29/include/mach/board.h
+++ b/arch/arm/mach-rk29/include/mach/board.h
author	xbw <xbw@rock-chips.com>
	Thu, 22 Sep 2011 05:19:11 +0000 (13:19 +0800)
committer	xbw <xbw@rock-chips.com>
	Thu, 22 Sep 2011 05:19:11 +0000 (13:19 +0800)