]> git.dujemihanovic.xyz Git - linux.git/commit
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)
commitac865f00af293d081356bec56eea90815094a60e
tree673a779aced7bae3b6ccf3c015a3c1f66a194267
parentd7807d8544e56af9b5523f15eddac09ec0291b4e
parent0ee2030af4e3e0a9cd26dfaa8c2f935beffa91d1
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()"
CREDITS
MAINTAINERS
drivers/pci/pcie/aspm.c