diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2020-12-16 00:11:08 +0300 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2020-12-16 00:11:08 +0300 |
commit | ff163da95b0ce29ce5ce597a1e98b3e528e57750 (patch) | |
tree | d8db256b7f82ca753c1feceda3b4e72748640501 /sound/aoa/Makefile | |
parent | a48e486b376bf78d945a0ccd772a5979042919c3 (diff) | |
parent | 9c2cc571f92500d2d0f4e70466c90ee8b2b440e6 (diff) | |
download | linux-ff163da95b0ce29ce5ce597a1e98b3e528e57750.tar.xz |
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
Diffstat (limited to 'sound/aoa/Makefile')
0 files changed, 0 insertions, 0 deletions