Merge branch 'next/soc' into next/dt

author Olof Johansson <olof@lixom.net>

Tue, 5 Feb 2013 21:19:03 +0000 (13:19 -0800)

committer Olof Johansson <olof@lixom.net>

Tue, 5 Feb 2013 21:19:03 +0000 (13:19 -0800)
author Olof Johansson <olof@lixom.net>
Tue, 5 Feb 2013 21:19:03 +0000 (13:19 -0800)
committer Olof Johansson <olof@lixom.net>
Tue, 5 Feb 2013 21:19:03 +0000 (13:19 -0800)
diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/boot/dts/Makefile
Simple merge
author	Olof Johansson <olof@lixom.net>
	Tue, 5 Feb 2013 21:19:03 +0000 (13:19 -0800)
committer	Olof Johansson <olof@lixom.net>
	Tue, 5 Feb 2013 21:19:03 +0000 (13:19 -0800)
		1	2
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history