123

Conflicts:
	arch/arm/mach-msm/perflock.c
	drivers/cpufreq/cpufreq_ondemand.c
	include/linux/cpufreq.h
	include/linux/init.h