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 | 97739501f207efe33145b918817f305b822987f8 (diff) | |
| parent | cfcadfaad7251d8b640713724b388164d75465b2 (diff) | |
| parent | 13610c93488b3c290f393c76744b308445921094 (diff) | |
Merge branches 'pm-pci' and 'pm-docs'pm-4.17-rc5
* 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")