Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze
authorTom Rini <trini@konsulko.com>
Thu, 19 Nov 2015 14:06:44 +0000 (09:06 -0500)
committerTom Rini <trini@konsulko.com>
Thu, 19 Nov 2015 14:06:44 +0000 (09:06 -0500)

Trivial merge