diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-01-03 14:18:57 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-01-03 14:18:57 -0800 |
| commit | ac865f00af293d081356bec56eea90815094a60e (patch) | |
| tree | 673a779aced7bae3b6ccf3c015a3c1f66a194267 /CREDITS | |
| parent | d7807d8544e56af9b5523f15eddac09ec0291b4e (diff) | |
| parent | 0ee2030af4e3e0a9cd26dfaa8c2f935beffa91d1 (diff) | |
| download | lwn-ac865f00af293d081356bec56eea90815094a60e.tar.gz lwn-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-- | CREDITS | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -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 |