Merge branch 'fpga' of git://www.denx.de/git/u-boot-microblaze
authorTom Rini <trini@ti.com>
Thu, 22 Jan 2015 14:48:22 +0000 (09:48 -0500)
committerTom Rini <trini@ti.com>
Thu, 22 Jan 2015 14:48:22 +0000 (09:48 -0500)

Trivial merge