diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-08-21 22:39:24 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-08-21 22:39:24 +0200 |
| commit | 01ac7c4c2e035bc8d0d47dc880bbc25bf562a648 (patch) | |
| tree | f19001486e59e656a64a720338f81883fb835712 | |
| parent | 5ef499cd571c293b74a30d77e7ef512edb6ded6b (diff) | |
| parent | 2a3eb51e30b9ac66fe1b75877627a7e4aaeca24a (diff) | |
| parent | 9d64b539b738fc181442caab95f1f76d9bd58539 (diff) | |
| parent | 3df6f61fff49632492490fb6e42646b803a9958a (diff) | |
| download | linux-01ac7c4c2e035bc8d0d47dc880bbc25bf562a648.tar.bz2 | |
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