Merge branch 'fpga' of git://www.denx.de/git/u-boot-microblaze
authorTom Rini <trini@ti.com>
Thu, 6 Feb 2014 16:20:23 +0000 (11:20 -0500)
committerTom Rini <trini@ti.com>
Thu, 6 Feb 2014 16:20:23 +0000 (11:20 -0500)

Trivial merge