projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9773950 cfcadfa 13610c9)
Merge branches 'pm-pci' and 'pm-docs'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 11 May 2018 13:17:18 +0000 (15:17 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 11 May 2018 13:17:18 +0000 (15:17 +0200)
* 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")


Trivial merge