Merge git://git.denx.de/u-boot-usb
authorTom Rini <trini@konsulko.com>
Fri, 13 Apr 2018 13:22:56 +0000 (09:22 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 13 Apr 2018 13:22:56 +0000 (09:22 -0400)

Trivial merge