diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-05-22 20:32:05 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-05-22 20:32:05 +0200 |
| commit | bb47e964175e5fb4c163066e4373fac055fe5da0 (patch) | |
| tree | 10272bc220589e9b5b44fa3843f8cc6c1284b95b /kernel | |
| parent | Merge branches 'intel_pstate', 'pm-cpufreq' and 'pm-cpufreq-sched' (diff) | |
| parent | PM / hibernate: Declare variables as static (diff) | |
| parent | PowerCap: Fix an error code in powercap_register_zone() (diff) | |
| download | linux-bb47e964175e5fb4c163066e4373fac055fe5da0.tar.xz linux-bb47e964175e5fb4c163066e4373fac055fe5da0.zip | |
Merge branches 'pm-sleep' and 'powercap'
* pm-sleep:
PM / hibernate: Declare variables as static
RTC: rtc-cmos: Fix wakeup from suspend-to-idle
PM / wakeup: Fix up wakeup_source_report_event()
* powercap:
PowerCap: Fix an error code in powercap_register_zone()