Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze
authorTom Rini <trini@konsulko.com>
Tue, 20 Dec 2016 13:42:50 +0000 (08:42 -0500)
committerTom Rini <trini@konsulko.com>
Tue, 20 Dec 2016 13:42:50 +0000 (08:42 -0500)

Trivial merge