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

author Tom Rini <trini@ti.com>

Thu, 20 Feb 2014 17:18:59 +0000 (12:18 -0500)

committer Tom Rini <trini@ti.com>

Thu, 20 Feb 2014 17:18:59 +0000 (12:18 -0500)
author Tom Rini <trini@ti.com>
Thu, 20 Feb 2014 17:18:59 +0000 (12:18 -0500)
committer Tom Rini <trini@ti.com>
Thu, 20 Feb 2014 17:18:59 +0000 (12:18 -0500)
diff --cc README
Simple merge
diff --cc include/configs/zynq-common.h
Simple merge
author	Tom Rini <trini@ti.com>
	Thu, 20 Feb 2014 17:18:59 +0000 (12:18 -0500)
committer	Tom Rini <trini@ti.com>
	Thu, 20 Feb 2014 17:18:59 +0000 (12:18 -0500)
		1	2
README	patch \|	diff1 \|	diff2 \|	blob \| history
include/configs/zynq-common.h	patch \|	diff1 \|	diff2 \|	blob \| history