Merge branch 'master' of git://git.denx.de/u-boot-usb
authorTom Rini <trini@ti.com>
Wed, 3 Jul 2013 12:40:58 +0000 (08:40 -0400)
committerTom Rini <trini@ti.com>
Wed, 3 Jul 2013 12:40:58 +0000 (08:40 -0400)

Trivial merge