Merge branch 'master' of git://git.denx.de/u-boot-usb
authorTom Rini <trini@ti.com>
Mon, 6 Oct 2014 19:49:50 +0000 (15:49 -0400)
committerTom Rini <trini@ti.com>
Mon, 6 Oct 2014 19:49:50 +0000 (15:49 -0400)

Trivial merge