Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze
authorTom Rini <trini@konsulko.com>
Thu, 22 Sep 2016 15:36:23 +0000 (11:36 -0400)
committerTom Rini <trini@konsulko.com>
Thu, 22 Sep 2016 15:36:23 +0000 (11:36 -0400)

Trivial merge