Merge git://git.denx.de/u-boot-usb
authorTom Rini <trini@konsulko.com>
Mon, 7 Dec 2015 02:52:40 +0000 (21:52 -0500)
committerTom Rini <trini@konsulko.com>
Mon, 7 Dec 2015 02:52:40 +0000 (21:52 -0500)

Trivial merge