Merge branch 'master' of git://git.denx.de/u-boot-net
authorTom Rini <trini@konsulko.com>
Mon, 15 Jul 2019 22:56:24 +0000 (18:56 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 15 Jul 2019 22:56:24 +0000 (18:56 -0400)

Trivial merge