diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-01-04 01:18:57 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-01-04 01:18:57 +0300 |
| commit | ac865f00af293d081356bec56eea90815094a60e (patch) | |
| tree | 673a779aced7bae3b6ccf3c015a3c1f66a194267 /MAINTAINERS | |
| parent | d7807d8544e56af9b5523f15eddac09ec0291b4e (diff) | |
| parent | 0ee2030af4e3e0a9cd26dfaa8c2f935beffa91d1 (diff) | |
| download | linux-ac865f00af293d081356bec56eea90815094a60e.tar.xz | |
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 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index f5c2450fa4ec..45b7b2046c10 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -16458,11 +16458,10 @@ F: Documentation/devicetree/bindings/pci/pci-armada8k.txt F: drivers/pci/controller/dwc/pcie-armada8k.c PCI DRIVER FOR CADENCE PCIE IP -M: Tom Joseph <tjoseph@cadence.com> L: linux-pci@vger.kernel.org -S: Maintained +S: Orphan F: Documentation/devicetree/bindings/pci/cdns,* -F: drivers/pci/controller/cadence/ +F: drivers/pci/controller/cadence/*cadence* PCI DRIVER FOR FREESCALE LAYERSCAPE M: Minghuan Lian <minghuan.Lian@nxp.com> |