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

author Tom Rini <trini@konsulko.com>

Fri, 24 Apr 2015 17:43:24 +0000 (13:43 -0400)

committer Tom Rini <trini@konsulko.com>

Fri, 24 Apr 2015 17:43:24 +0000 (13:43 -0400)
author Tom Rini <trini@konsulko.com>
Fri, 24 Apr 2015 17:43:24 +0000 (13:43 -0400)
committer Tom Rini <trini@konsulko.com>
Fri, 24 Apr 2015 17:43:24 +0000 (13:43 -0400)
diff --cc arch/arm/Kconfig
Simple merge
diff --cc common/spl/spl.c
Simple merge
author	Tom Rini <trini@konsulko.com>
	Fri, 24 Apr 2015 17:43:24 +0000 (13:43 -0400)
committer	Tom Rini <trini@konsulko.com>
	Fri, 24 Apr 2015 17:43:24 +0000 (13:43 -0400)
		1	2
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
common/spl/spl.c	patch \|	diff1 \|	diff2 \|	blob \| history