Merge git://git.denx.de/u-boot-marvell
authorTom Rini <trini@konsulko.com>
Tue, 29 May 2018 15:01:46 +0000 (11:01 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 29 May 2018 15:01:46 +0000 (11:01 -0400)

Trivial merge