summaryrefslogtreecommitdiffstats
path: root/CREDITS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2024-01-03 23:18:57 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2024-01-03 23:18:57 +0100
commitac865f00af293d081356bec56eea90815094a60e (patch)
tree673a779aced7bae3b6ccf3c015a3c1f66a194267 /CREDITS
parentMerge tag 'apparmor-pr-2024-01-03' of git://git.kernel.org/pub/scm/linux/kern... (diff)
parentMAINTAINERS: Orphan Cadence PCIe IP (diff)
downloadlinux-ac865f00af293d081356bec56eea90815094a60e.tar.xz
linux-ac865f00af293d081356bec56eea90815094a60e.zip
Merge tag 'pci-v6.7-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci
Pull PCI fixes from Bjorn Helgaas: - Revert an ASPM patch that caused an unintended reboot when resuming after suspend (Bjorn Helgaas) - Orphan Cadence PCIe IP (Bjorn Helgaas) * tag 'pci-v6.7-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci: MAINTAINERS: Orphan Cadence PCIe IP Revert "PCI/ASPM: Remove pcie_aspm_pm_state_change()"
Diffstat (limited to 'CREDITS')
-rw-r--r--CREDITS4
1 files changed, 4 insertions, 0 deletions
diff --git a/CREDITS b/CREDITS
index 81845c39e3cf..6b4b06bb683b 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1855,6 +1855,10 @@ D: Fedora kernel maintenance (2003-2014).
D: 'Trinity' and similar fuzz testing work.
D: Misc/Other.
+N: Tom Joseph
+E: tjoseph@cadence.com
+D: Cadence PCIe driver
+
N: Martin Josfsson
E: gandalf@wlug.westbo.se
P: 1024D/F6B6D3B1 7610 7CED 5C34 4AA6 DBA2 8BE1 5A6D AF95 F6B6 D3B1