Merge branch 'zynq' of git://www.denx.de/git/u-boot-microblaze
authorTom Rini <trini@konsulko.com>
Tue, 28 Jul 2015 15:31:21 +0000 (11:31 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 28 Jul 2015 15:31:21 +0000 (11:31 -0400)

Trivial merge