Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze
authorTom Rini <trini@konsulko.com>
Mon, 4 Apr 2016 18:34:09 +0000 (14:34 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 4 Apr 2016 18:34:09 +0000 (14:34 -0400)

Trivial merge