Merge branch 'master' of git://git.denx.de/u-boot-usb
authorTom Rini <trini@ti.com>
Fri, 21 Sep 2012 16:29:38 +0000 (09:29 -0700)
committerTom Rini <trini@ti.com>
Fri, 21 Sep 2012 16:29:38 +0000 (09:29 -0700)

Trivial merge