Merge branch 'master' of git://git.denx.de/u-boot-uniphier
authorTom Rini <trini@konsulko.com>
Mon, 29 Feb 2016 15:50:01 +0000 (10:50 -0500)
committerTom Rini <trini@konsulko.com>
Mon, 29 Feb 2016 15:50:01 +0000 (10:50 -0500)

Trivial merge