Merge git://www.denx.de/git/u-boot-marvell
authorTom Rini <trini@konsulko.com>
Tue, 12 Apr 2016 13:10:54 +0000 (09:10 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 12 Apr 2016 13:10:54 +0000 (09:10 -0400)

Trivial merge