Merge branch 'master' of git://git.denx.de/u-boot-usb
authorTom Rini <trini@ti.com>
Tue, 27 Aug 2013 13:49:43 +0000 (09:49 -0400)
committerTom Rini <trini@ti.com>
Tue, 27 Aug 2013 13:49:43 +0000 (09:49 -0400)

Trivial merge