Merge branch 'fpga' of git://www.denx.de/git/u-boot-microblaze
authorTom Rini <trini@ti.com>
Wed, 6 Nov 2013 21:11:34 +0000 (16:11 -0500)
committerTom Rini <trini@ti.com>
Wed, 6 Nov 2013 21:11:34 +0000 (16:11 -0500)

Trivial merge