Merge branch 'master' of git://git.denx.de/u-boot-usb
authorTom Rini <[email protected]>
Tue, 6 Dec 2016 13:07:20 +0000 (08:07 -0500)
committerTom Rini <[email protected]>
Tue, 6 Dec 2016 13:07:20 +0000 (08:07 -0500)

Trivial merge