Merge branch 'cm-10.1' into testbranch
Force CPU Link
Added voltage control

vdd: voltage control: implemented voltage control

Conflicts:
	arch/arm/mach-msm/acpuclock-8x60.c
	arch/arm/mach-msm/include/mach/rpm-8660.h

vdd: cpufreq: build error fix

Conflicts:
	arch/arm/mach-msm/acpuclock-8x60.c
	drivers/cpufreq/Kconfig
Revert "Add BFQ IO Scheduler"

This reverts commit 734ed299c068c8a0aba3a295fb2193f204223d54.
BFQ 3.0-V6r1 from Patches

Conflicts:
	arch/arm/configs/cyanogenmod_hercules_defconfig
	block/Kconfig.iosched
Add Samsung

Conflicts:
	arch/arm/configs/cyanogenmod_hercules_defconfig
	arch/arm/mach-msm/board-msm8x60_celox.c
	drivers/cpufreq/Kconfig
	drivers/cpufreq/cpufreq_ondemand.c
msm8660: disable CONFIG_GPIO_SX150X

  * this define was not set before the kernel rebase on 20130424
  * if enabled, this define sets up control for tricolored LED's
    and some other hardware that these phones don't have.
  * by disabling this, we clean up some i2c errors in kmsg

Change-Id: I50ba7c95e50eb7e7d63cb2bf2f8a61468be8fcfe
msm_fb: Fix the hang issues due to improper usage of vsync

For LCDC/DSI command/DTV interfaces, fix the various corner cases
of wait4vsync getting stuck due to TG turned off/wait4sync
count being reset to zero etc. Add timeout to waiting for vsync
to avoid hang issues when vsync interrupt is turned off.

Change-Id: I97322f3f1c6cc13b484cfa594d2fadcdec53d48a
Signed-off-by: Padmanabhan Komanduru <pkomandu@codeaurora.org>
Remove plugs -- Attempt to speed up IO
lcdc_ld9040: fix locking in lcd_sysfs_store_auto_brightness()

  * mutex was unlocked before the call to lcdc_ld9040_set_brightness()

Change-Id: I73765ca66f3dce908f93290d0e76da8e72c1d2ae
Add CPUPower by Vincent Guittot
Sched Tweaks to improve performance - Credit to Andrew Vagin <avagin@openvz.org>
Pick next highest
Revert "OVERCLOCK GPU"

This reverts commit 2f7514f1a580c07ca0dfddfb92b677e9e8834101.
kgsl: gpu: part 1: increased gpu bandwidth and bumped up 3D GPU frequency

Conflicts:
	arch/arm/mach-msm/clock-8x60.c
kgsl: gpu: part 2: adding in 3D scaling control
kgsl: gpu: part 3: added files and defconfigs

Conflicts:
	arch/arm/mach-msm/Kconfig
Overclock GPU 2D plus a few 3D tweaks
kgsl: change how active power level is set
Google Snappy Compression/Decompression

	modified:   drivers/staging/Kconfig
	modified:   drivers/staging/Makefile
	new file:   drivers/staging/snappy/Kconfig
	new file:   drivers/staging/snappy/Makefile
	new file:   drivers/staging/snappy/csnappy.h
	new file:   drivers/staging/snappy/csnappy_compress.c
	new file:   drivers/staging/snappy/csnappy_decompress.c
	new file:   drivers/staging/snappy/csnappy_internal.h
	modified:   drivers/staging/zcache/zcache-main.c
	modified:   drivers/staging/zram/Kconfig
	modified:   drivers/staging/zram/zram_drv.c
	modified:   include/linux/page-flags.h
	modified:   mm/ashmem.c
	modified:   mm/vmscan.c