Merge branch 'master' of git://www.denx.de/git/u-boot-uniphier
authorTom Rini <trini@konsulko.com>
Mon, 25 Apr 2016 17:45:32 +0000 (13:45 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 25 Apr 2016 17:45:32 +0000 (13:45 -0400)

Trivial merge