tree f19001486e59e656a64a720338f81883fb835712
parent 5ef499cd571c293b74a30d77e7ef512edb6ded6b
parent 2a3eb51e30b9ac66fe1b75877627a7e4aaeca24a
parent 9d64b539b738fc181442caab95f1f76d9bd58539
parent 3df6f61fff49632492490fb6e42646b803a9958a
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1534883964 +0200
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1534883964 +0200

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

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