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

author Tom Rini <trini@ti.com>

Fri, 29 Aug 2014 15:06:51 +0000 (11:06 -0400)

committer Tom Rini <trini@ti.com>

Fri, 29 Aug 2014 15:06:51 +0000 (11:06 -0400)
author Tom Rini <trini@ti.com>
Fri, 29 Aug 2014 15:06:51 +0000 (11:06 -0400)
committer Tom Rini <trini@ti.com>
Fri, 29 Aug 2014 15:06:51 +0000 (11:06 -0400)
diff --cc README
Simple merge
diff --cc arch/arm/Kconfig
Simple merge
diff --cc common/board_f.c
Simple merge
author	Tom Rini <trini@ti.com>
	Fri, 29 Aug 2014 15:06:51 +0000 (11:06 -0400)
committer	Tom Rini <trini@ti.com>
	Fri, 29 Aug 2014 15:06:51 +0000 (11:06 -0400)
		1	2
README	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
common/board_f.c	patch \|	diff1 \|	diff2 \|	blob \| history