Merge branch 'fpga' of git://www.denx.de/git/u-boot-microblaze
authorTom Rini <trini@ti.com>
Mon, 12 Aug 2013 12:54:32 +0000 (08:54 -0400)
committerTom Rini <trini@ti.com>
Mon, 12 Aug 2013 12:54:32 +0000 (08:54 -0400)

Trivial merge