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)
commitef050374e1eedec45bd260e0ac9eb98f699267d2
tree070b779b601571ad3778090e90aa68b2b6175d15
parent97739501f207efe33145b918817f305b822987f8
parentcfcadfaad7251d8b640713724b388164d75465b2
parent13610c93488b3c290f393c76744b308445921094
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")