Merge branch 'master' of git://git.denx.de/u-boot-usb
authorTom Rini <trini@ti.com>
Tue, 11 Nov 2014 21:59:25 +0000 (16:59 -0500)
committerTom Rini <trini@ti.com>
Tue, 11 Nov 2014 21:59:25 +0000 (16:59 -0500)

Trivial merge