Merge tag 'pci-v6.7-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 3 Jan 2024 22:18:57 +0000 (14:18 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 3 Jan 2024 22:18:57 +0000 (14:18 -0800)
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()"

1  2 
CREDITS
MAINTAINERS
drivers/pci/pcie/aspm.c

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