Merge branch 'master' of git://git.denx.de/u-boot-usb
authorTom Rini <trini@ti.com>
Thu, 18 Dec 2014 17:37:18 +0000 (12:37 -0500)
committerTom Rini <trini@ti.com>
Thu, 18 Dec 2014 17:37:18 +0000 (12:37 -0500)

Trivial merge