Merge branch 'master' of git://git.denx.de/u-boot-usb
authorTom Rini <[email protected]>
Thu, 30 Aug 2018 14:06:29 +0000 (10:06 -0400)
committerTom Rini <[email protected]>
Thu, 30 Aug 2018 14:06:29 +0000 (10:06 -0400)

Trivial merge