Merge git://git.denx.de/u-boot-net
authorTom Rini <[email protected]>
Thu, 7 Sep 2017 18:48:23 +0000 (14:48 -0400)
committerTom Rini <[email protected]>
Thu, 7 Sep 2017 18:48:23 +0000 (14:48 -0400)

Trivial merge