Merge branch 'zynq' of git://www.denx.de/git/u-boot-microblaze
authorTom Rini <trini@konsulko.com>
Mon, 7 Dec 2015 13:13:02 +0000 (08:13 -0500)
committerTom Rini <trini@konsulko.com>
Mon, 7 Dec 2015 13:13:02 +0000 (08:13 -0500)
1  2 
include/configs/xilinx_zynqmp.h
include/configs/xilinx_zynqmp_ep.h

Simple merge
Simple merge