Merge branch 'master' of git://git.denx.de/u-boot-uniphier
authorTom Rini <trini@konsulko.com>
Sun, 31 May 2015 00:16:01 +0000 (20:16 -0400)
committerTom Rini <trini@konsulko.com>
Sun, 31 May 2015 00:16:01 +0000 (20:16 -0400)

Trivial merge