Merge branch 'master' of git://git.denx.de/u-boot-uniphier
authorTom Rini <trini@konsulko.com>
Sun, 15 Mar 2015 18:31:39 +0000 (14:31 -0400)
committerTom Rini <trini@konsulko.com>
Sun, 15 Mar 2015 18:31:39 +0000 (14:31 -0400)

Trivial merge