msm_rq_stats/cpufreq: Bring in line with upstream

Change-Id: I4084cae5554f316aa012f494c39a141cf33ee017
Signed-off-by: Randy DuCharme <radio.ad5gb@gmail.com>

Conflicts:
	arch/arm/mach-msm/msm_rq_stats.c
	drivers/cpufreq/cpufreq_conservative.c
	drivers/cpufreq/cpufreq_ondemand.c