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

author yxj <yxj@yxj-desktop.(none)>

Fri, 12 Aug 2011 08:15:51 +0000 (16:15 +0800)

committer yxj <yxj@yxj-desktop.(none)>

Fri, 12 Aug 2011 08:15:51 +0000 (16:15 +0800)
author yxj <yxj@yxj-desktop.(none)>
Fri, 12 Aug 2011 08:15:51 +0000 (16:15 +0800)
committer yxj <yxj@yxj-desktop.(none)>
Fri, 12 Aug 2011 08:15:51 +0000 (16:15 +0800)
diff --cc arch/arm/mach-rk29/board-rk29-ddr3sdk.c
Simple merge
diff --cc arch/arm/mach-rk29/board-rk29sdk.c
Simple merge
author	yxj <yxj@yxj-desktop.(none)>
	Fri, 12 Aug 2011 08:15:51 +0000 (16:15 +0800)
committer	yxj <yxj@yxj-desktop.(none)>
	Fri, 12 Aug 2011 08:15:51 +0000 (16:15 +0800)
		1	2
arch/arm/mach-rk29/board-rk29-ddr3sdk.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-rk29/board-rk29sdk.c	patch \|	diff1 \|	diff2 \|	blob \| history