Merge branch 'master' of git://git.denx.de/u-boot-uniphier
authorTom Rini <trini@konsulko.com>
Mon, 2 May 2016 16:18:43 +0000 (12:18 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 2 May 2016 16:18:43 +0000 (12:18 -0400)

Trivial merge