Update intelli_plug + intellidemand

Conflicts:
	arch/arm/mach-msm/intelli_plug.c
	drivers/cpufreq/cpufreq_intellidemand.c