Merge git://git.denx.de/u-boot-net
authorTom Rini <[email protected]>
Sat, 3 Jun 2017 22:05:28 +0000 (18:05 -0400)
committerTom Rini <[email protected]>
Sat, 3 Jun 2017 22:05:28 +0000 (18:05 -0400)

Trivial merge