diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-01-27 00:08:59 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-01-27 00:08:59 +0100 |
| commit | ff7e593c9cf3ccceaab7ac600cbd52cb9ff4c57a (patch) | |
| tree | 84d721e253655d9f2b774ba95155201ff5c13dec | |
| parent | 7a308bb3016f57e5be11a677d15b821536419d36 (diff) | |
| parent | e326ce013a8e851193eb337aafb1aa396c533a61 (diff) | |
| parent | 1443ebbacfd7f8d84fbbbf629ef66a12dc8a4b4e (diff) | |
| download | linux-ff7e593c9cf3ccceaab7ac600cbd52cb9ff4c57a.tar.bz2 | |
Merge branches 'pm-sleep' and 'pm-cpufreq'
* pm-sleep:
Revert "PM / sleep / ACPI: Use the ACPI_FADT_LOW_POWER_S0 flag"
* pm-cpufreq:
cpufreq: intel_pstate: Fix sysfs limits enforcement for performance policy