Merge git://git.denx.de/u-boot-usb
authorTom Rini <trini@ti.com>
Fri, 29 Aug 2014 15:15:18 +0000 (11:15 -0400)
committerTom Rini <trini@ti.com>
Fri, 29 Aug 2014 15:15:18 +0000 (11:15 -0400)

Trivial merge