Merge git://git.denx.de/u-boot-usb
authorTom Rini <trini@ti.com>
Tue, 2 Sep 2014 20:37:57 +0000 (16:37 -0400)
committerTom Rini <trini@ti.com>
Tue, 2 Sep 2014 20:37:57 +0000 (16:37 -0400)

Trivial merge