Merge branch 'master' of git://git.denx.de/u-boot-arm

author Tom Rini <trini@ti.com>

Mon, 24 Nov 2014 22:05:11 +0000 (17:05 -0500)

committer Tom Rini <trini@ti.com>

Mon, 24 Nov 2014 22:05:11 +0000 (17:05 -0500)
author Tom Rini <trini@ti.com>
Mon, 24 Nov 2014 22:05:11 +0000 (17:05 -0500)
committer Tom Rini <trini@ti.com>
Mon, 24 Nov 2014 22:05:11 +0000 (17:05 -0500)
diff --cc Kconfig
Simple merge
diff --cc arch/arm/Kconfig
Simple merge
author	Tom Rini <trini@ti.com>
	Mon, 24 Nov 2014 22:05:11 +0000 (17:05 -0500)
committer	Tom Rini <trini@ti.com>
	Mon, 24 Nov 2014 22:05:11 +0000 (17:05 -0500)
		1	2
Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history