Merge branch 'master' of git://git.denx.de/u-boot-uniphier
authorTom Rini <trini@konsulko.com>
Tue, 18 Oct 2016 22:48:04 +0000 (18:48 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 18 Oct 2016 22:48:04 +0000 (18:48 -0400)

Trivial merge