Merge git://git.denx.de/u-boot-marvell
authorTom Rini <trini@konsulko.com>
Tue, 5 Jun 2018 11:13:42 +0000 (07:13 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 5 Jun 2018 11:13:42 +0000 (07:13 -0400)

Trivial merge