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

author Tom Rini <trini@ti.com>

Tue, 11 Nov 2014 21:59:44 +0000 (16:59 -0500)

committer Tom Rini <trini@ti.com>

Tue, 11 Nov 2014 21:59:44 +0000 (16:59 -0500)
author Tom Rini <trini@ti.com>
Tue, 11 Nov 2014 21:59:44 +0000 (16:59 -0500)
committer Tom Rini <trini@ti.com>
Tue, 11 Nov 2014 21:59:44 +0000 (16:59 -0500)
diff --cc arch/arm/dts/Makefile
Simple merge
diff --cc include/configs/socfpga_common.h
Simple merge
author	Tom Rini <trini@ti.com>
	Tue, 11 Nov 2014 21:59:44 +0000 (16:59 -0500)
committer	Tom Rini <trini@ti.com>
	Tue, 11 Nov 2014 21:59:44 +0000 (16:59 -0500)
		1	2
arch/arm/dts/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
include/configs/socfpga_common.h	patch \|	diff1 \|	diff2 \|	blob \| history