Merge branch 'master' of git://git.denx.de/u-boot-sh
authorTom Rini <trini@konsulko.com>
Thu, 1 Oct 2020 12:36:09 +0000 (08:36 -0400)
committerTom Rini <trini@konsulko.com>
Thu, 1 Oct 2020 12:36:09 +0000 (08:36 -0400)

Trivial merge