Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze
authorTom Rini <trini@ti.com>
Tue, 6 May 2014 18:55:27 +0000 (14:55 -0400)
committerTom Rini <trini@ti.com>
Tue, 6 May 2014 18:55:27 +0000 (14:55 -0400)

Trivial merge