Merge branch 'master' of git://git.denx.de/u-boot-uniphier
authorTom Rini <trini@konsulko.com>
Wed, 22 Jun 2016 00:43:21 +0000 (20:43 -0400)
committerTom Rini <trini@konsulko.com>
Wed, 22 Jun 2016 00:43:21 +0000 (20:43 -0400)

Trivial merge