Merge git://git.denx.de/u-boot-net
authorTom Rini <[email protected]>
Thu, 22 Mar 2018 20:35:43 +0000 (16:35 -0400)
committerTom Rini <[email protected]>
Thu, 22 Mar 2018 20:35:43 +0000 (16:35 -0400)

Trivial merge