Merge git://git.denx.de/u-boot-usb
authorTom Rini <[email protected]>
Fri, 23 Feb 2018 18:04:48 +0000 (13:04 -0500)
committerTom Rini <[email protected]>
Fri, 23 Feb 2018 18:04:48 +0000 (13:04 -0500)

Trivial merge