Merge branch 'master' of git://git.denx.de/u-boot-usb
authorTom Rini <trini@ti.com>
Wed, 12 Jun 2013 20:33:49 +0000 (16:33 -0400)
committerTom Rini <trini@ti.com>
Wed, 12 Jun 2013 20:33:49 +0000 (16:33 -0400)

Trivial merge