Merge branch 'master' of git://git.denx.de/u-boot-usb
authorTom Rini <trini@konsulko.com>
Tue, 17 Jan 2017 15:26:03 +0000 (10:26 -0500)
committerTom Rini <trini@konsulko.com>
Tue, 17 Jan 2017 15:26:03 +0000 (10:26 -0500)

Trivial merge