Merge git://git.denx.de/u-boot-usb
authorTom Rini <[email protected]>
Sat, 27 Jan 2018 19:48:52 +0000 (14:48 -0500)
committerTom Rini <[email protected]>
Sat, 27 Jan 2018 19:48:52 +0000 (14:48 -0500)

Trivial merge