Merge git://www.denx.de/git/u-boot-marvell
authorTom Rini <[email protected]>
Mon, 4 Apr 2016 17:15:23 +0000 (13:15 -0400)
committerTom Rini <[email protected]>
Mon, 4 Apr 2016 17:15:23 +0000 (13:15 -0400)

Trivial merge