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

Trivial merge