Add IO Schedulers and CPU Govs

Add IO Schedulers and CPU Govs

Add IO Schedulers and CPU Govs

Conflicts:
	arch/arm/configs/cyanogenmod_hercules_defconfig
	drivers/cpufreq/Kconfig

	modified:   block/Kconfig.iosched
	modified:   block/Makefile
	new file:   block/sio-iosched.c
	new file:   block/vr-iosched.c
	modified:   drivers/cpufreq/Kconfig
	modified:   drivers/cpufreq/Makefile
	new file:   drivers/cpufreq/cpufreq_abyssplug.c
	new file:   drivers/cpufreq/cpufreq_adaptive.c
	new file:   drivers/cpufreq/cpufreq_asswax.c
	new file:   drivers/cpufreq/cpufreq_badass.c
	new file:   drivers/cpufreq/cpufreq_fantasy.c
	new file:   drivers/cpufreq/cpufreq_gallimaufry.c
	new file:   drivers/cpufreq/cpufreq_intellidemand.c
	new file:   drivers/cpufreq/cpufreq_interactiveX.c
	new file:   drivers/cpufreq/cpufreq_lagfree.c
	new file:   drivers/cpufreq/cpufreq_lazy.c
	new file:   drivers/cpufreq/cpufreq_lionheart.c
	new file:   drivers/cpufreq/cpufreq_lulzactive.c
	new file:   drivers/cpufreq/cpufreq_minmax.c
	new file:   drivers/cpufreq/cpufreq_pegasusq.c
	new file:   drivers/cpufreq/cpufreq_sakuractive.c
	new file:   drivers/cpufreq/cpufreq_savaged_zen.c
	new file:   drivers/cpufreq/cpufreq_savagedzen.c
	new file:   drivers/cpufreq/cpufreq_scary.c
	new file:   drivers/cpufreq/cpufreq_slp.c
	new file:   drivers/cpufreq/cpufreq_smartass2.c
	new file:   drivers/cpufreq/cpufreq_smoothass.c
	new file:   drivers/cpufreq/cpufreq_superbad.c
	new file:   drivers/cpufreq/cpufreq_virtuous.c
	new file:   drivers/cpufreq/cpufreq_wheatley.c
	modified:   include/linux/cpufreq.h

Fix Cherry-pick Issues

Conflicts:
	arch/arm/configs/celox_usa_tmo_defconfig
	block/Kconfig.iosched
	drivers/cpufreq/Kconfig
	drivers/cpufreq/Makefile
	include/linux/cpufreq.h

fix up