Merge branch 'master' of git://git.denx.de/u-boot-net
authorTom Rini <trini@konsulko.com>
Fri, 19 Jul 2019 00:32:07 +0000 (20:32 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 19 Jul 2019 00:32:07 +0000 (20:32 -0400)

Trivial merge