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

Trivial merge