Merge git://git.denx.de/u-boot-marvell
authorTom Rini <trini@konsulko.com>
Tue, 17 Apr 2018 13:14:33 +0000 (09:14 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 17 Apr 2018 13:14:33 +0000 (09:14 -0400)

Trivial merge