Merge git://git.denx.de/u-boot-marvell
authorTom Rini <[email protected]>
Wed, 10 Jan 2018 13:05:57 +0000 (08:05 -0500)
committerTom Rini <[email protected]>
Wed, 10 Jan 2018 13:05:57 +0000 (08:05 -0500)

Trivial merge