Merge branch 'master' of git://git.denx.de/u-boot-usb
authorTom Rini <trini@ti.com>
Mon, 10 Mar 2014 18:06:51 +0000 (14:06 -0400)
committerTom Rini <trini@ti.com>
Mon, 10 Mar 2014 18:06:51 +0000 (14:06 -0400)

Trivial merge