Merge branch 'master' of git://git.denx.de/u-boot-uniphier
authorTom Rini <trini@konsulko.com>
Wed, 25 May 2016 16:27:44 +0000 (12:27 -0400)
committerTom Rini <trini@konsulko.com>
Wed, 25 May 2016 16:27:44 +0000 (12:27 -0400)

Trivial merge