Merge branches 'pm-pci' and 'pm-docs'

Browse source

* 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")

...

This commit is contained in:

Rafael J. Wysocki 2018-05-11 15:17:18 +02:00

parent 97739501f2 cfcadfaad7 13610c9348

commit ef050374e1

3 changed files with 29 additions and 12 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

Documentation/admin-guide/pm/intel_pstate.rst

View file

2

Documentation/admin-guide/pm/sleep-states.rst

View file

37

drivers/pci/pci.c

View file