Extreme UCing

Conflicts:

	arch/arm/mach-msm/acpuclock-8960.c
	drivers/cpufreq/cpufreq.c