Merge git://git.denx.de/u-boot-uniphier
authorTom Rini <trini@konsulko.com>
Mon, 23 Apr 2018 16:21:20 +0000 (12:21 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 23 Apr 2018 16:21:20 +0000 (12:21 -0400)

Trivial merge