Merge remote-tracking branch 'gz/kitkat' into ose

Conflicts:
	drivers/cpufreq/cpufreq_stats.c