Conflicts:
	drivers/cpufreq/cpufreq_hotplug.c
Linux 3.0.32
Linux 3.0.33