From: Bjorn Helgaas Date: Tue, 15 Dec 2020 21:11:08 +0000 (-0600) Subject: Merge branch 'pci/pm' X-Git-Tag: howlett/maple_spf/20210104~339^2~12 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ff163da95b0ce29ce5ce597a1e98b3e528e57750;p=users%2Fjedix%2Flinux-maple.git Merge branch 'pci/pm' - Add sysfs attribute for device power state (Maximilian Luz) - Rename pci_wakeup_bus() to pci_resume_bus() (Mika Westerberg) - Do not generate wakeup event when runtime resuming bus (Mika Westerberg) * pci/pm: PCI/PM: Do not generate wakeup event when runtime resuming device PCI/PM: Rename pci_wakeup_bus() to pci_resume_bus() PCI: Add sysfs attribute for device power state --- ff163da95b0ce29ce5ce597a1e98b3e528e57750