Merge branch 'master' of git://git.denx.de/u-boot-uniphier
authorTom Rini <trini@konsulko.com>
Thu, 11 Aug 2016 14:45:53 +0000 (10:45 -0400)
committerTom Rini <trini@konsulko.com>
Thu, 11 Aug 2016 14:45:53 +0000 (10:45 -0400)

Trivial merge