Intellidemand

Conflicts:
	arch/arm/mach-msm/cpufreq.c
	arch/arm/mach-msm/lge/mako/board-mako.c
	drivers/cpufreq/Kconfig
	drivers/cpufreq/Makefile
	drivers/cpufreq/cpufreq_intelliactive.c
	include/linux/cpufreq.h