Merge branch 'master' of git://git.denx.de/u-boot-sh
authorTom Rini <trini@konsulko.com>
Fri, 17 Aug 2018 11:25:04 +0000 (07:25 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 17 Aug 2018 11:25:04 +0000 (07:25 -0400)

Trivial merge