Merge branch 'master' of git://git.denx.de/u-boot-net
authorTom Rini <trini@konsulko.com>
Thu, 14 Jun 2018 11:20:41 +0000 (07:20 -0400)
committerTom Rini <trini@konsulko.com>
Thu, 14 Jun 2018 11:20:41 +0000 (07:20 -0400)

Trivial merge