Merge branch 'master' of git://git.denx.de/u-boot-usb
authorTom Rini <trini@konsulko.com>
Tue, 29 Aug 2017 02:42:12 +0000 (22:42 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 29 Aug 2017 02:42:12 +0000 (22:42 -0400)

Trivial merge