Merge git://www.denx.de/git/u-boot-marvell
authorTom Rini <trini@konsulko.com>
Tue, 31 May 2016 14:26:02 +0000 (10:26 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 31 May 2016 14:26:02 +0000 (10:26 -0400)

Trivial merge