Linux kernel 2.6.32.42

Conflicts:

	drivers/cpufreq/cpufreq_stats.c

Conflicts:

	drivers/cpufreq/cpufreq_stats.c