Merge branch 'master' of https://gitlab.denx.de/u-boot/custodians/u-boot-net
authorTom Rini <trini@konsulko.com>
Mon, 9 Dec 2019 18:48:22 +0000 (13:48 -0500)
committerTom Rini <trini@konsulko.com>
Mon, 9 Dec 2019 18:48:22 +0000 (13:48 -0500)

Trivial merge