From: Stephen Rothwell Date: Thu, 29 Oct 2020 21:35:33 +0000 (+1100) Subject: Merge remote-tracking branch 'usb-gadget-fixes/fixes' into master X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=45566143a29e4cedd35116d55891e279aaa10f9d;p=users%2Fhch%2Fblock.git Merge remote-tracking branch 'usb-gadget-fixes/fixes' into master # Conflicts: # drivers/usb/cdns3/gadget.c # drivers/usb/dwc3/dwc3-of-simple.c # drivers/usb/dwc3/gadget.c --- 45566143a29e4cedd35116d55891e279aaa10f9d