Merge branch 'master' of git://git.denx.de/u-boot-uniphier
authorTom Rini <trini@konsulko.com>
Tue, 11 Sep 2018 12:50:10 +0000 (08:50 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 11 Sep 2018 12:50:10 +0000 (08:50 -0400)

Trivial merge