Merge remote-tracking branch 'gk/master' into ose

Conflicts:
	arch/arm/boot/compressed/Makefile
	arch/arm/configs/gzGhost_defconfig
	arch/arm/mach-msm/intelli_plug.c
	arch/arm/vfp/vfpmodule.c
	block/Kconfig.iosched
	drivers/cpufreq/Kconfig
	drivers/cpufreq/Makefile
	drivers/cpufreq/cpufreq_dancedance.c
	include/linux/cpufreq.h