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

Trivial merge