Merge branch 'master' of git://git.denx.de/u-boot-usb
authorTom Rini <trini@konsulko.com>
Fri, 6 Jul 2018 12:55:09 +0000 (08:55 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 6 Jul 2018 12:55:09 +0000 (08:55 -0400)

Trivial merge