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

author Tom Rini <trini@ti.com>

Mon, 27 Oct 2014 13:08:42 +0000 (09:08 -0400)

committer Tom Rini <trini@ti.com>

Mon, 27 Oct 2014 13:08:42 +0000 (09:08 -0400)
author Tom Rini <trini@ti.com>
Mon, 27 Oct 2014 13:08:42 +0000 (09:08 -0400)
committer Tom Rini <trini@ti.com>
Mon, 27 Oct 2014 13:08:42 +0000 (09:08 -0400)
diff --cc arch/arm/cpu/armv7/mx6/soc.c
Simple merge
diff --cc arch/arm/lib/bootm.c
Simple merge
author	Tom Rini <trini@ti.com>
	Mon, 27 Oct 2014 13:08:42 +0000 (09:08 -0400)
committer	Tom Rini <trini@ti.com>
	Mon, 27 Oct 2014 13:08:42 +0000 (09:08 -0400)
		1	2
arch/arm/cpu/armv7/mx6/soc.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/lib/bootm.c	patch \|	diff1 \|	diff2 \|	blob \| history