diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-05-11 15:17:18 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-05-11 15:17:18 +0200 |
commit | ef050374e1eedec45bd260e0ac9eb98f699267d2 (patch) | |
tree | 070b779b601571ad3778090e90aa68b2b6175d15 | |
parent | cpufreq: schedutil: Avoid using invalid next_freq (diff) | |
parent | PCI / PM: Check device_may_wakeup() in pci_enable_wake() (diff) | |
parent | PM: docs: intel_pstate: fix Active Mode w/o HWP paragraph (diff) | |
download | linux-dev-ef050374e1eedec45bd260e0ac9eb98f699267d2.tar.xz linux-dev-ef050374e1eedec45bd260e0ac9eb98f699267d2.zip |
Merge branches 'pm-pci' and 'pm-docs'
* pm-pci:
PCI / PM: Check device_may_wakeup() in pci_enable_wake()
PCI / PM: Always check PME wakeup capability for runtime wakeup support
* pm-docs:
PM: docs: intel_pstate: fix Active Mode w/o HWP paragraph
PM: docs: sleep-states: Fix a typo ("includig")