Merge branch 'master' of git://git.denx.de/u-boot-sh
authorTom Rini <trini@konsulko.com>
Mon, 16 Sep 2019 01:14:26 +0000 (21:14 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 16 Sep 2019 01:14:26 +0000 (21:14 -0400)

Trivial merge