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)
commitdcf4cb068e19a7f39e4a295102b247376bd27c95
tree181457dc202707b9ee622d6dce5117aab8e102d5
parent25ef4bea59dadbd25dec1dbb376ed84dfc735f02
parent8bebf03c73cd0830cb2cd234021004cde67c6412
Merge branch 'zynq' of git://denx.de/git/u-boot-microblaze
include/configs/xilinx_zynqmp.h
include/configs/xilinx_zynqmp_ep.h