Merge branch 'fpga' of git://www.denx.de/git/u-boot-microblaze
authorTom Rini <trini@ti.com>
Tue, 13 May 2014 11:34:08 +0000 (07:34 -0400)
committerTom Rini <trini@ti.com>
Tue, 13 May 2014 11:34:08 +0000 (07:34 -0400)

Trivial merge