projects / platform / kernel / linux-starfive.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bee1f89 e49d033)
Merge 5.12-rc6 into usb-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 5 Apr 2021 06:56:10 +0000 (08:56 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 5 Apr 2021 06:56:10 +0000 (08:56 +0200)
We want the USB fixes in here as well and it resolves a merge issue with
xhci-mtk.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1  2 
drivers/usb/dwc3/dwc3-pci.c patch | diff1 | diff2 | blob | history
drivers/usb/dwc3/dwc3-qcom.c patch | diff1 | diff2 | blob | history
drivers/usb/dwc3/gadget.c patch | diff1 | diff2 | blob | history

diff --cc drivers/usb/dwc3/dwc3-pci.c
Simple merge
diff --cc drivers/usb/dwc3/dwc3-qcom.c
Simple merge
diff --cc drivers/usb/dwc3/gadget.c
Simple merge
Domain: System / Kernel;