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

Trivial merge