Merge branch 'master' of git://git.denx.de/u-boot-usb
authorTom Rini <trini@ti.com>
Fri, 28 Mar 2014 12:19:05 +0000 (08:19 -0400)
committerTom Rini <trini@ti.com>
Fri, 28 Mar 2014 12:19:05 +0000 (08:19 -0400)

Trivial merge