Merge branch 'master' of git://git.denx.de/u-boot-usb
authorTom Rini <trini@konsulko.com>
Sat, 7 May 2016 02:12:15 +0000 (22:12 -0400)
committerTom Rini <trini@konsulko.com>
Sat, 7 May 2016 02:12:15 +0000 (22:12 -0400)

Trivial merge