Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into develop-3.10

author xjh <xujh@rock-chips.com>

Wed, 7 May 2014 13:43:43 +0000 (21:43 +0800)

committer xjh <xujh@rock-chips.com>

Wed, 7 May 2014 13:43:43 +0000 (21:43 +0800)
author xjh <xujh@rock-chips.com>
Wed, 7 May 2014 13:43:43 +0000 (21:43 +0800)
committer xjh <xujh@rock-chips.com>
Wed, 7 May 2014 13:43:43 +0000 (21:43 +0800)
diff --cc arch/arm/boot/dts/rk3288-p977.dts
Simple merge
diff --cc arch/arm/boot/dts/rk3288-tb.dts
Simple merge
author	xjh <xujh@rock-chips.com>
	Wed, 7 May 2014 13:43:43 +0000 (21:43 +0800)
committer	xjh <xujh@rock-chips.com>
	Wed, 7 May 2014 13:43:43 +0000 (21:43 +0800)
		1	2
arch/arm/boot/dts/rk3288-p977.dts	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/rk3288-tb.dts	patch \|	diff1 \|	diff2 \|	blob \| history