Merge branch 'zynq' of git://www.denx.de/git/u-boot-microblaze

author Tom Rini <trini@ti.com>

Mon, 26 Jan 2015 11:42:15 +0000 (06:42 -0500)

committer Tom Rini <trini@ti.com>

Mon, 26 Jan 2015 11:42:15 +0000 (06:42 -0500)
author Tom Rini <trini@ti.com>
Mon, 26 Jan 2015 11:42:15 +0000 (06:42 -0500)
committer Tom Rini <trini@ti.com>
Mon, 26 Jan 2015 11:42:15 +0000 (06:42 -0500)
diff --cc arch/arm/cpu/armv7/zynq/spl.c
Simple merge
diff --cc board/xilinx/zynq/board.c
Simple merge
author	Tom Rini <trini@ti.com>
	Mon, 26 Jan 2015 11:42:15 +0000 (06:42 -0500)
committer	Tom Rini <trini@ti.com>
	Mon, 26 Jan 2015 11:42:15 +0000 (06:42 -0500)
		1	2
arch/arm/cpu/armv7/zynq/spl.c	patch \|	diff1 \|	diff2 \|	blob \| history
board/xilinx/zynq/board.c	patch \|	diff1 \|	diff2 \|	blob \| history