Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze
authorTom Rini <trini@ti.com>
Wed, 10 Sep 2014 10:59:49 +0000 (06:59 -0400)
committerTom Rini <trini@ti.com>
Wed, 10 Sep 2014 10:59:49 +0000 (06:59 -0400)

Trivial merge