Merge branch 'zynq' of git://www.denx.de/git/u-boot-microblaze
authorTom Rini <trini@ti.com>
Fri, 29 Aug 2014 15:07:35 +0000 (11:07 -0400)
committerTom Rini <trini@ti.com>
Fri, 29 Aug 2014 15:07:35 +0000 (11:07 -0400)

Trivial merge