Merge branch 'master' of git://git.denx.de/u-boot-usb
authorTom Rini <trini@konsulko.com>
Sat, 30 Jun 2018 12:52:06 +0000 (08:52 -0400)
committerTom Rini <trini@konsulko.com>
Sat, 30 Jun 2018 12:52:06 +0000 (08:52 -0400)

Trivial merge