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

Trivial merge