Merge branch 'master' of git://git.denx.de/u-boot-uniphier
authorTom Rini <trini@konsulko.com>
Tue, 22 May 2018 17:53:26 +0000 (13:53 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 22 May 2018 17:53:26 +0000 (13:53 -0400)

Trivial merge