Merge branch 'master' of git://git.denx.de/u-boot-net
authorTom Rini <trini@konsulko.com>
Fri, 26 Oct 2018 00:30:05 +0000 (20:30 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 26 Oct 2018 00:30:05 +0000 (20:30 -0400)

Trivial merge