Merge branch 'master' of git://git.denx.de/u-boot-uniphier
authorTom Rini <trini@konsulko.com>
Tue, 25 Apr 2017 01:08:42 +0000 (21:08 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 25 Apr 2017 01:08:42 +0000 (21:08 -0400)

Trivial merge