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

author roger <cz@rock-chips.com>

Thu, 14 Aug 2014 06:52:36 +0000 (14:52 +0800)

committer roger <cz@rock-chips.com>

Thu, 14 Aug 2014 06:52:36 +0000 (14:52 +0800)
author roger <cz@rock-chips.com>
Thu, 14 Aug 2014 06:52:36 +0000 (14:52 +0800)
committer roger <cz@rock-chips.com>
Thu, 14 Aug 2014 06:52:36 +0000 (14:52 +0800)
diff --cc arch/arm/boot/dts/rk3128-box.dts
Simple merge
diff --cc arch/arm/boot/dts/rk312x.dtsi
Simple merge
author	roger <cz@rock-chips.com>
	Thu, 14 Aug 2014 06:52:36 +0000 (14:52 +0800)
committer	roger <cz@rock-chips.com>
	Thu, 14 Aug 2014 06:52:36 +0000 (14:52 +0800)
		1	2
arch/arm/boot/dts/rk3128-box.dts	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/rk312x.dtsi	patch \|	diff1 \|	diff2 \|	blob \| history