Merge branch 'master' of git://git.denx.de/u-boot-usb
authorTom Rini <trini@ti.com>
Mon, 18 Mar 2013 19:33:47 +0000 (15:33 -0400)
committerTom Rini <trini@ti.com>
Mon, 18 Mar 2013 19:33:47 +0000 (15:33 -0400)

Trivial merge