Merge branch 'master' of git://git.denx.de/u-boot-sh
authorTom Rini <trini@konsulko.com>
Sun, 17 Jun 2018 13:09:40 +0000 (09:09 -0400)
committerTom Rini <trini@konsulko.com>
Sun, 17 Jun 2018 13:09:40 +0000 (09:09 -0400)

Trivial merge