Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze
authorTom Rini <trini@konsulko.com>
Tue, 2 Aug 2016 11:32:30 +0000 (07:32 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 2 Aug 2016 11:32:30 +0000 (07:32 -0400)

Trivial merge