Merge branch 'master' of git://git.denx.de/u-boot-sh
authorTom Rini <trini@konsulko.com>
Sat, 6 Oct 2018 01:17:35 +0000 (21:17 -0400)
committerTom Rini <trini@konsulko.com>
Sat, 6 Oct 2018 01:17:35 +0000 (21:17 -0400)

Trivial merge