Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze
authorTom Rini <trini@konsulko.com>
Wed, 27 Jan 2016 20:05:12 +0000 (15:05 -0500)
committerTom Rini <trini@konsulko.com>
Wed, 27 Jan 2016 20:05:12 +0000 (15:05 -0500)

Trivial merge