General update: governors, i/o schedulers, fixes, voltage changer
ok
Merge branch 'master' of https://github.com/Pesach85/PH85-KERNEL

Conflicts:
	arch/arm/mach-omap2/id.c
	arch/arm/mach-omap2/lpddr2_elpida_data.c
	arch/arm/mach-omap2/lpddr2_jedec_data.c
	arch/arm/mach-omap2/lpddr2_samsung_data.c
	arch/arm/mach-omap2/opp4xxx_data.c
	arch/arm/mach-omap2/voltage.h
	block/Kconfig.iosched
	drivers/cpufreq/Kconfig
	drivers/cpufreq/cpufreq_pegasusq.c
	include/linux/cpufreq.h