Merge branch 'master' of git://git.denx.de/u-boot-usb
authorTom Rini <trini@konsulko.com>
Thu, 11 Aug 2016 11:22:55 +0000 (07:22 -0400)
committerTom Rini <trini@konsulko.com>
Thu, 11 Aug 2016 11:22:55 +0000 (07:22 -0400)

Trivial merge