Merge branch 'master' of https://gitlab.denx.de/u-boot/custodians/u-boot-net
authorTom Rini <trini@konsulko.com>
Tue, 10 Mar 2020 11:51:56 +0000 (07:51 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 10 Mar 2020 11:51:56 +0000 (07:51 -0400)

Trivial merge