Merge branch 'master' of git://git.denx.de/u-boot-usb
authorTom Rini <trini@konsulko.com>
Thu, 7 Jul 2016 13:58:41 +0000 (09:58 -0400)
committerTom Rini <trini@konsulko.com>
Thu, 7 Jul 2016 13:58:41 +0000 (09:58 -0400)

Trivial merge