]> www.infradead.org Git - users/hch/block.git/commitdiff
Merge remote-tracking branch 'usb-gadget-fixes/fixes' into master
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 29 Oct 2020 21:35:33 +0000 (08:35 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 29 Oct 2020 21:35:33 +0000 (08:35 +1100)
# Conflicts:
# drivers/usb/cdns3/gadget.c
# drivers/usb/dwc3/dwc3-of-simple.c
# drivers/usb/dwc3/gadget.c


Trivial merge