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

Trivial merge