Disable perflock
Import Topology drivers from CAF
force fastcharge
drivers/cpufreq Add:intellidemand
arch/arm/mach-msm/ Add: Initial OC

Conflicts:
	arch/arm/mach-msm/acpuclock-8064.c
	arch/arm/mach-msm/board-m7wl-regulator.c
arm/mach-msm acpuclock-8064 ADD: 192mhz step
arch/arm/mach-msm/ Add: Gpu oc and increase bottleneck

Signed-off-by: Zarboz <zarboz@gmail.com>
staging: Introduce Zcache/Zram/Zsmalloc from 3.6.0 upstream kernel

Signed-off-by: Zarboz <zarboz@gmail.com>
arch/arm/mach-msm/acpuclock-krait ADD: Cmdline_options

Signed-off-by: Zarboz <zarboz@gmail.com>
arch/arm/mach-msm cleanup GPU OC

Signed-off-by: Zarboz <zarboz@gmail.com>
block: Introduce ROW Scheduler

Signed-off-by: Zarboz <zarboz@gmail.com>
block: introduce BFQ scheduler

Signed-off-by: Zarboz <zarboz@gmail.com>
Block: Introduce FIOPS I/O scheduler

Signed-off-by: Zarboz <zarboz@gmail.com>
block: Introduce SIO I/O scheduler

Signed-off-by: Zarboz <zarboz@gmail.com>
block: introduce VR I/O scheduler
block: add kconfig and makefile triggers for files
fixing voltages

Signed-off-by: Zarboz <zarboz@gmail.com>
drivers/staging: Add: Google snappy compression support
block: cgroups, kconfig, build bits for BFQ-v6-3.4

Update Kconfig.iosched and do the related Makefile changes to include
kernel configuration options for BFQ. Also add the bfqio controller
to the cgroups subsystem.

Signed-off-by: Paolo Valente <paolo.valente@unimore.it>
Signed-off-by: Arianna Avanzini <avanzini.arianna@gmail.com>
Signed-off-by: Bryan Smith <zarboz@gmail.com>
add frandom