Merge branch 'master' of git://git.denx.de/u-boot-usb
authorTom Rini <trini@konsulko.com>
Fri, 18 Dec 2015 02:46:04 +0000 (21:46 -0500)
committerTom Rini <trini@konsulko.com>
Fri, 18 Dec 2015 02:46:04 +0000 (21:46 -0500)

Trivial merge