summaryrefslogtreecommitdiff
path: root/CREDITS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2024-07-05 12:33:00 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2024-07-05 12:33:00 -0700
commitd270dd21bee023ab627f34cfb77a9b89a688492a (patch)
tree7b5647b1a1ab184559563ce2cdec29fcfcae88f0 /CREDITS
parentb673f2bda0c9d306e330a236c87706d8de18107a (diff)
parent419d57d429f6e1fbd9024d34b11eb84b3138c60e (diff)
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
Diffstat (limited to 'CREDITS')
-rw-r--r--CREDITS4
1 files changed, 3 insertions, 1 deletions
diff --git a/CREDITS b/CREDITS
index 1a1a54555e11..f87c0fa62cfc 100644
--- a/CREDITS
+++ b/CREDITS
@@ -3150,9 +3150,11 @@ S: Triftstra=DFe 55
S: 13353 Berlin
S: Germany
-N: Gustavo Pimental
+N: Gustavo Pimentel
E: gustavo.pimentel@synopsys.com
D: PCI driver for Synopsys DesignWare
+D: Synopsys DesignWare eDMA driver
+D: Synopsys DesignWare xData traffic generator
N: Emanuel Pirker
E: epirker@edu.uni-klu.ac.at