Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze
authorTom Rini <trini@konsulko.com>
Fri, 18 Dec 2015 12:28:24 +0000 (07:28 -0500)
committerTom Rini <trini@konsulko.com>
Fri, 18 Dec 2015 12:28:24 +0000 (07:28 -0500)

Trivial merge