Merge git://git.denx.de/u-boot-usb
authorTom Rini <trini@konsulko.com>
Fri, 29 May 2015 11:31:38 +0000 (07:31 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 29 May 2015 11:31:38 +0000 (07:31 -0400)

Trivial merge