Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze
authorTom Rini <trini@konsulko.com>
Wed, 29 Apr 2015 10:46:03 +0000 (06:46 -0400)
committerTom Rini <trini@konsulko.com>
Wed, 29 Apr 2015 10:46:03 +0000 (06:46 -0400)

Trivial merge