Merge git://git.denx.de/u-boot-uniphier
authorTom Rini <trini@konsulko.com>
Mon, 11 Dec 2017 22:06:04 +0000 (17:06 -0500)
committerTom Rini <trini@konsulko.com>
Mon, 11 Dec 2017 22:06:04 +0000 (17:06 -0500)

Trivial merge