Merge branch 'master' of git://git.denx.de/u-boot-usb
authorTom Rini <trini@konsulko.com>
Fri, 10 Aug 2018 11:21:02 +0000 (07:21 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 10 Aug 2018 11:21:02 +0000 (07:21 -0400)

Trivial merge