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

author cmc <cmc@rock-chips.com>

Mon, 29 Nov 2010 07:21:29 +0000 (15:21 +0800)

committer cmc <cmc@rock-chips.com>

Mon, 29 Nov 2010 07:21:29 +0000 (15:21 +0800)
author cmc <cmc@rock-chips.com>
Mon, 29 Nov 2010 07:21:29 +0000 (15:21 +0800)
committer cmc <cmc@rock-chips.com>
Mon, 29 Nov 2010 07:21:29 +0000 (15:21 +0800)
diff --cc arch/arm/mach-rk29/board-rk29sdk.c

index 821046796ba8a020fc6ecb6fbe4d0b9bbe0f4957,e247da0c43276c83350ac538d483ca4d3e7bb83d..925c0e44d01f887f5488c6bf584a4fd251c0ccd3

mode 100755,100644..100644
--- 1/arch/arm/mach-rk29/board-rk29sdk.c
--- 2/arch/arm/mach-rk29/board-rk29sdk.c
+++ b/arch/arm/mach-rk29/board-rk29sdk.c
author	cmc <cmc@rock-chips.com>
	Mon, 29 Nov 2010 07:21:29 +0000 (15:21 +0800)
committer	cmc <cmc@rock-chips.com>
	Mon, 29 Nov 2010 07:21:29 +0000 (15:21 +0800)