Merge branch 'imx/dt' into next/dt

author Arnd Bergmann <[email protected]>

Thu, 28 Jul 2011 15:25:46 +0000 (15:25 +0000)

committer Arnd Bergmann <[email protected]>

Thu, 28 Jul 2011 15:25:46 +0000 (15:25 +0000)
author Arnd Bergmann <[email protected]>
Thu, 28 Jul 2011 15:25:46 +0000 (15:25 +0000)
committer Arnd Bergmann <[email protected]>
Thu, 28 Jul 2011 15:25:46 +0000 (15:25 +0000)
diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/Makefile
Simple merge
author	Arnd Bergmann <[email protected]>
	Thu, 28 Jul 2011 15:25:46 +0000 (15:25 +0000)
committer	Arnd Bergmann <[email protected]>
	Thu, 28 Jul 2011 15:25:46 +0000 (15:25 +0000)
		1	2
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history