Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze
authorTom Rini <trini@konsulko.com>
Tue, 24 May 2016 12:20:43 +0000 (08:20 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 24 May 2016 12:20:43 +0000 (08:20 -0400)

Trivial merge