Merge git://www.denx.de/git/u-boot-marvell
authorTom Rini <trini@konsulko.com>
Tue, 8 Aug 2017 21:05:33 +0000 (17:05 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 8 Aug 2017 21:05:33 +0000 (17:05 -0400)

Trivial merge