]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit8084453c4b8321cc8c966f8a28ffcf82b6f3a87b
tree070b779b601571ad3778090e90aa68b2b6175d15
parentd92c8e9cd0458178d20adae498b27761496ef1b5
parent3e5481c3eb2fce825df01853c1900fdc07448de1
parentc95fa6619d89de3625d1a1c7361bf34e48b18d31
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")