Merge git://www.denx.de/git/u-boot-marvell
authorTom Rini <[email protected]>
Wed, 12 Jul 2017 12:16:41 +0000 (08:16 -0400)
committerTom Rini <[email protected]>
Wed, 12 Jul 2017 12:16:41 +0000 (08:16 -0400)

Trivial merge