001
002
added io schedulers and governors

Conflicts:
	kernel/drivers/cpufreq/Kconfig
	kernel/drivers/cpufreq/Makefile
	kernel/drivers/cpufreq/cpufreq_hotplug.c
	kernel/include/linux/cpufreq.h