Commit d270dd21 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'pci-v6.10-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci

Pull pci update from Bjorn Helgaas:

 - Update MAINTAINERS and CREDITS to credit Gustavo Pimentel with the
   Synopsys DesignWare eDMA driver and reflect that he is no longer at
   Synopsys and isn't in a position to maintain the DesignWare xData
   traffic generator (Bjorn Helgaas)

* tag 'pci-v6.10-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci:
  CREDITS: Add Synopsys DesignWare eDMA driver for Gustavo Pimentel
  MAINTAINERS: Orphan Synopsys DesignWare xData traffic generator
parents b673f2bd 419d57d4
...@@ -3150,9 +3150,11 @@ S: Triftstra=DFe 55 ...@@ -3150,9 +3150,11 @@ S: Triftstra=DFe 55
S: 13353 Berlin S: 13353 Berlin
S: Germany S: Germany
N: Gustavo Pimental N: Gustavo Pimentel
E: gustavo.pimentel@synopsys.com E: gustavo.pimentel@synopsys.com
D: PCI driver for Synopsys DesignWare D: PCI driver for Synopsys DesignWare
D: Synopsys DesignWare eDMA driver
D: Synopsys DesignWare xData traffic generator
N: Emanuel Pirker N: Emanuel Pirker
E: epirker@edu.uni-klu.ac.at E: epirker@edu.uni-klu.ac.at
......
...@@ -6238,9 +6238,8 @@ S: Maintained ...@@ -6238,9 +6238,8 @@ S: Maintained
F: drivers/usb/dwc3/ F: drivers/usb/dwc3/
DESIGNWARE XDATA IP DRIVER DESIGNWARE XDATA IP DRIVER
M: Gustavo Pimentel <gustavo.pimentel@synopsys.com>
L: linux-pci@vger.kernel.org L: linux-pci@vger.kernel.org
S: Maintained S: Orphan
F: Documentation/misc-devices/dw-xdata-pcie.rst F: Documentation/misc-devices/dw-xdata-pcie.rst
F: drivers/misc/dw-xdata-pcie.c F: drivers/misc/dw-xdata-pcie.c
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment