]> www.infradead.org Git - users/hch/dma-mapping.git/commitdiff
Merge tag 'pci-v6.10-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 Jul 2024 19:33:00 +0000 (12:33 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 Jul 2024 19:33:00 +0000 (12:33 -0700)
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

1  2 
CREDITS
MAINTAINERS

diff --cc CREDITS
Simple merge
diff --cc MAINTAINERS
Simple merge