Merge branch 'pm-cpufreq'

* pm-cpufreq:
  cpufreq: Fix cpufreq regression after suspend/resume

diff --git a/drivers/cpufreq/cpufreq_stats.c b/drivers/cpufreq/cpufreq_stats.c
index 6d35caa911672306b9e0cdff1e008226f145dfa9..cd9e81713a71343b00f4c2e761f5f32c56824ab3 100644 (file)
--- a/drivers/cpufreq/cpufreq_stats.c
+++ b/drivers/cpufreq/cpufreq_stats.c
@@ -349,6 +349,7 @@ static int __cpuinit cpufreq_stat_cpu_callback(struct notifier_block *nfb,
 
        switch (action) {
        case CPU_ONLINE:
+       case CPU_ONLINE_FROZEN:
                cpufreq_update_policy(cpu);
                break;
        case CPU_DOWN_PREPARE: