Merge git://git.denx.de/u-boot-sh
authorTom Rini <[email protected]>
Sat, 26 Aug 2017 19:10:49 +0000 (15:10 -0400)
committerTom Rini <[email protected]>
Sat, 26 Aug 2017 19:10:49 +0000 (15:10 -0400)

Trivial merge