Merge branches 'pm-cpufreq', 'pm-pci' and 'pm-sleep'

Browse source

Merge fixes for the ondemand and conservative cpufreq governors,
PCI power management and system wakeup framework.

* pm-cpufreq:
  cpufreq: governor: Avoid accessing invalid governor_data

* pm-pci:
  PCI / ACPI / PM: Resume all bridges on suspend-to-RAM

* pm-sleep:
  PM / sleep: wakeup: Fix build error caused by missing SRCU support

...

This commit is contained in:

Rafael J. Wysocki 2018-08-21 22:39:24 +02:00

parent 5ef499cd57 2a3eb51e30 9d64b539b7 3df6f61fff

commit 01ac7c4c2e

3 changed files with 13 additions and 6 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

12

drivers/cpufreq/cpufreq_governor.c

View file

6

drivers/pci/pci-acpi.c

View file

1

kernel/power/Kconfig

View file