Removed failed merge files (Talustus)
	modified:   drivers/cpufreq/Kconfig
	modified:   drivers/cpufreq/Makefile
	modified:   include/linux/cpufreq.h