Merge branch 'master' of git://git.denx.de/u-boot-uniphier
authorTom Rini <trini@konsulko.com>
Fri, 1 Jul 2016 21:43:06 +0000 (17:43 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 1 Jul 2016 21:43:06 +0000 (17:43 -0400)

Trivial merge