]> 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)
commit40af48ed32ed76d59a914ba81d822950557c50cc
tree070b779b601571ad3778090e90aa68b2b6175d15
parentdc4273fb439587b8dde6360ac2f3568c0da3b9bb
parentcdfcd73cab271007dc0f2c9631ead5f9c15ccb86
parent7e029da82c9d6704e3df05ffe3c17c021dcd4ea6
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")