Merge git://git.denx.de/u-boot-sh
authorTom Rini <[email protected]>
Wed, 18 Apr 2018 20:24:14 +0000 (16:24 -0400)
committerTom Rini <[email protected]>
Wed, 18 Apr 2018 20:24:14 +0000 (16:24 -0400)

Trivial merge