Merge branch 'master' of git://git.denx.de/u-boot-uniphier
authorTom Rini <trini@konsulko.com>
Mon, 13 Jun 2016 03:28:57 +0000 (23:28 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 13 Jun 2016 03:28:57 +0000 (23:28 -0400)

Trivial merge