Intellidemand 4.4

Conflicts:
	arch/arm/mach-msm/cpufreq.c