aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-05-11 15:17:18 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-05-11 15:17:18 +0200
commitef050374e1eedec45bd260e0ac9eb98f699267d2 (patch)
tree070b779b601571ad3778090e90aa68b2b6175d15
parentcpufreq: schedutil: Avoid using invalid next_freq (diff)
parentPCI / PM: Check device_may_wakeup() in pci_enable_wake() (diff)
parentPM: docs: intel_pstate: fix Active Mode w/o HWP paragraph (diff)
downloadlinux-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")