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

diff --cc drivers/acpi/sleep.c
Simple merge

diff --cc drivers/cpufreq/intel_pstate.c
index f91c25718d164c9d9339acf671d67937995fe076,4737520ec8230a830d80e81c0dbc9dbaa96d0dc7,ed215c5592f6245309ee38cc96487fdbf25fbd56..a54d65aa776d064f025036cf9aa35790d83d82e8
--- 1/drivers/cpufreq/intel_pstate.c
--- 2/drivers/cpufreq/intel_pstate.c
--- 3/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@@@ -1995,19 -1516,11 -1941,20 +1995,20 @@@@ static int intel_pstate_set_policy(stru
                policy->max = policy->cpuinfo.max_freq;
        }
   
 -      if (cpu->policy == CPUFREQ_POLICY_PERFORMANCE) {
 -              limits = &performance_limits;
 -              if (policy->max >= policy->cpuinfo.max_freq) {
 +      if (per_cpu_limits)
 +              perf_limits = cpu->perf_limits;
 + 
 +      mutex_lock(&intel_pstate_limits_lock);
 + 
 +      if (policy->policy == CPUFREQ_POLICY_PERFORMANCE) {
 +              if (!perf_limits) {
 +                      limits = &performance_limits;
 +                      perf_limits = limits;
 +              }
-               if (policy->max >= policy->cpuinfo.max_freq) {
++              if (policy->max >= policy->cpuinfo.max_freq &&
++                  !limits->no_turbo) {
                        pr_debug("set performance\n");
 -                      intel_pstate_set_performance_limits(limits);
 +                      intel_pstate_set_performance_limits(perf_limits);
                        goto out;
                }
        } else {