Merge branch 'zynq' of git://www.denx.de/git/u-boot-microblaze
authorTom Rini <trini@konsulko.com>
Thu, 19 Nov 2015 16:25:36 +0000 (11:25 -0500)
committerTom Rini <trini@konsulko.com>
Thu, 19 Nov 2015 16:25:36 +0000 (11:25 -0500)

Trivial merge