Merge branch 'master' of git://git.denx.de/u-boot-sh
authorTom Rini <[email protected]>
Sun, 20 May 2018 13:44:38 +0000 (09:44 -0400)
committerTom Rini <[email protected]>
Sun, 20 May 2018 13:44:38 +0000 (09:44 -0400)

Trivial merge