Merge branch 'mvebu/dt' into for-next

author Jason Cooper <jason@lakedaemon.net>

Wed, 23 Oct 2013 11:02:48 +0000 (11:02 +0000)

committer Jason Cooper <jason@lakedaemon.net>

Wed, 23 Oct 2013 11:02:48 +0000 (11:02 +0000)
author Jason Cooper <jason@lakedaemon.net>
Wed, 23 Oct 2013 11:02:48 +0000 (11:02 +0000)
committer Jason Cooper <jason@lakedaemon.net>
Wed, 23 Oct 2013 11:02:48 +0000 (11:02 +0000)
diff --cc arch/arm/boot/dts/armada-370-netgear-rn102.dts
Simple merge
diff --cc arch/arm/boot/dts/armada-xp.dtsi
Simple merge
diff --cc arch/arm/boot/dts/kirkwood.dtsi
Simple merge
diff --cc arch/arm/mach-kirkwood/board-dt.c
Simple merge
author	Jason Cooper <jason@lakedaemon.net>
	Wed, 23 Oct 2013 11:02:48 +0000 (11:02 +0000)
committer	Jason Cooper <jason@lakedaemon.net>
	Wed, 23 Oct 2013 11:02:48 +0000 (11:02 +0000)
		1	2
arch/arm/boot/dts/armada-370-netgear-rn102.dts	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/armada-xp.dtsi	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/kirkwood.dtsi	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-kirkwood/board-dt.c	patch \|	diff1 \|	diff2 \|	blob \| history