add vr sio zen schedulers

Conflicts:
	block/Kconfig.iosched
	block/Makefile
add vr sio zen schedulers

Conflicts:
	block/Kconfig.iosched
	block/Makefile
add vr sio zen schedulers

Conflicts:
	block/Kconfig.iosched
	block/Makefile
add vr sio zen schedulers

Conflicts:
	block/Kconfig.iosched
	block/Makefile
add Badass

Conflicts:
	drivers/cpufreq/Makefile
add Lionheart

Conflicts:
	drivers/cpufreq/Kconfig
	drivers/cpufreq/Makefile
initial Overclock

Conflicts:
	arch/arm/mach-msm/board-m7-regulator.c
synaptics sweep2wake

Conflicts:
	drivers/input/touchscreen/synaptics_3200.c
	include/linux/synaptics_i2c_rmi.h
Sweep2wake updated for HTC One

Conflicts:
	drivers/input/touchscreen/synaptics_3200.c
logo2menu based on tbalden https://github.com/TeaMSeven/android_kernel_htc_m7-sense/commit/b664405dde0519aea04d7c4c74aac9f9573d38f4

Conflicts:
	drivers/input/touchscreen/synaptics_3200.c
Sweep2wake, logo2menu, logo2wake

Conflicts:
	drivers/input/touchscreen/synaptics_3200.c
dynamic fsync from chad

Conflicts:
	fs/Makefile
cpufreq intellidemand

Conflicts:
	drivers/cpufreq/Kconfig
	drivers/cpufreq/Makefile
	include/linux/cpufreq.h
add option to kconfig for OC

Conflicts:
	arch/arm/mach-msm/Kconfig
	arch/arm/mach-msm/acpuclock-8064.c
patch from caf

Conflicts:
	arch/arm/mach-msm/cpufreq.c
add cpu min/max policy

Conflicts:
	arch/arm/mach-msm/cpufreq.c
reclaim som ram from logger

Conflicts:
	drivers/staging/android/lowmemorykiller.c
revert add cpu min/max policy

Conflicts:
	arch/arm/mach-msm/cpufreq.c
all linaro 03 errors resolved

Conflicts:
	drivers/power/pm8921-charger-htc.c
	drivers/power/pm8xxx-ccadc.c
	drivers/usb/gadget/android.c
	net/bluetooth/l2cap_core.c
add cputime in state stats for all cores

Conflicts:
	drivers/cpufreq/cpufreq_stats.c