Merge branch 'master' of git://git.denx.de/u-boot-uniphier
authorTom Rini <trini@konsulko.com>
Sun, 14 Feb 2016 13:39:32 +0000 (08:39 -0500)
committerTom Rini <trini@konsulko.com>
Sun, 14 Feb 2016 13:39:32 +0000 (08:39 -0500)

Trivial merge