Merge branch 'omap1-usb-fix' into omap-for-v4.21/omap1
authorTony Lindgren <tony@atomide.com>
Tue, 11 Dec 2018 16:14:58 +0000 (08:14 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 11 Dec 2018 16:14:58 +0000 (08:14 -0800)

Trivial merge