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

author Tom Rini <trini@ti.com>

Tue, 10 Feb 2015 15:40:43 +0000 (10:40 -0500)

committer Tom Rini <trini@ti.com>

Tue, 10 Feb 2015 15:40:43 +0000 (10:40 -0500)
author Tom Rini <trini@ti.com>
Tue, 10 Feb 2015 15:40:43 +0000 (10:40 -0500)
committer Tom Rini <trini@ti.com>
Tue, 10 Feb 2015 15:40:43 +0000 (10:40 -0500)
diff --cc arch/arm/Kconfig
Simple merge
diff --cc common/Makefile
Simple merge
diff --cc tools/imximage.c
Simple merge
author	Tom Rini <trini@ti.com>
	Tue, 10 Feb 2015 15:40:43 +0000 (10:40 -0500)
committer	Tom Rini <trini@ti.com>
	Tue, 10 Feb 2015 15:40:43 +0000 (10:40 -0500)
		1	2
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
common/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
tools/imximage.c	patch \|	diff1 \|	diff2 \|	blob \| history