Merge git://git.denx.de/u-boot-usb
authorTom Rini <trini@konsulko.com>
Mon, 21 Aug 2017 11:16:56 +0000 (07:16 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 21 Aug 2017 11:16:56 +0000 (07:16 -0400)

Trivial merge