Merge git://git.denx.de/u-boot-marvell
authorTom Rini <trini@konsulko.com>
Mon, 14 May 2018 12:52:48 +0000 (08:52 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 14 May 2018 12:52:48 +0000 (08:52 -0400)

Trivial merge