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

Trivial merge