Merge branch 'pm-cpufreq'

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

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: