Merge branch 'master' of git://git.denx.de/u-boot-uniphier
authorTom Rini <trini@konsulko.com>
Sat, 29 Oct 2016 21:15:24 +0000 (17:15 -0400)
committerTom Rini <trini@konsulko.com>
Sat, 29 Oct 2016 21:15:24 +0000 (17:15 -0400)

Trivial merge