Merge branch 'master' of git://git.denx.de/u-boot-sh
authorTom Rini <trini@konsulko.com>
Tue, 30 Jul 2019 23:19:04 +0000 (19:19 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 30 Jul 2019 23:19:04 +0000 (19:19 -0400)

Trivial merge