Merge branch 'master' of git://git.denx.de/u-boot-net
authorTom Rini <trini@konsulko.com>
Thu, 26 Jul 2018 19:55:42 +0000 (15:55 -0400)
committerTom Rini <trini@konsulko.com>
Thu, 26 Jul 2018 19:55:42 +0000 (15:55 -0400)

Trivial merge