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)
commitc88eaea0a0a809884388c3a5727d960bac0b0ced
tree931ee327363b8cd83c3867d972c33972527639d8
parent6841deb6209ee420b7bcb6e320a8a06fd57658df
parenta877bec3ecd7961211a59b2c130e055e0f771976
Merge branch 'master' of git://git.denx.de/u-boot-socfpga
arch/arm/dts/Makefile
include/configs/socfpga_common.h