Merge branch 'master' of git://git.denx.de/u-boot-socfpga
authorTom Rini <trini@ti.com>
Tue, 11 Nov 2014 21:59:44 +0000 (16:59 -0500)
committerTom Rini <trini@ti.com>
Tue, 11 Nov 2014 21:59:44 +0000 (16:59 -0500)
1  2 
arch/arm/dts/Makefile
include/configs/socfpga_common.h

Simple merge
Simple merge