Merge git://git.denx.de/u-boot-usb
authorTom Rini <trini@konsulko.com>
Tue, 16 Jun 2015 00:45:50 +0000 (20:45 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 16 Jun 2015 00:45:50 +0000 (20:45 -0400)

Trivial merge