OSDN Git Service

Merge branches 'pm-cpufreq', 'pm-pci' and 'pm-sleep'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 21 Aug 2018 20:39:24 +0000 (22:39 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 21 Aug 2018 20:39:24 +0000 (22:39 +0200)
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


Trivial merge