board-8974: fix merge derp

Change-Id: I12f6e6c460e56c90b7ee3762d19b990600bfb785
intelli_plug is OFF by default. + tuning
Add support for single core eco-mode

Conflicts:
	arch/arm/mach-msm/intelli_plug.c

Change-Id: I2c0db6e98768454e128314be0d1a647c406a3655

Conflicts:
	arch/arm/mach-msm/intelli_plug.c
cpufreq: make thermal-engine play nicely with OC

* not perfect yet but should do for now

Conflicts:

	drivers/cpufreq/cpufreq.c

Conflicts:
	drivers/cpufreq/cpufreq.c

Change-Id: Id47016f2ae67893a8d0fc5f631ecc2db30a8dd82

Conflicts:
	drivers/cpufreq/cpufreq.c
cpufreq: set policy max properly

* how did this ever work?
clock-krait/cpufreq: custom voltage control v1

* TODO: control only available frequencies
deadline: tweak generally recommended for SSDs
deadline: Allow 0ms deadline latency, increase the read speed

Change a timer compare from after to after-equals, thus allowing
0 timeout and making deadline schedule FIFO.

Signed-off-by: xiaobing tu <xiaobing.tu@intel.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
cpufreq: force cpuN policy to match cpu0 when changing freq or gov
Add defconfig flag for the VDD Control

Change-Id: I357d023cd05e49eab6b883a1456a06449ac31275
defconfig: enable VDD Control

Change-Id: I0cc05d5324496ad082fd8dd1b7599dc72fcc25e2
cpufreq: fix merge derp

Change-Id: If5e73daa958549c0f9c8503a807a1bcf0fc514f1
mach-msm: forgot Kconfig flag for VDD Control

Change-Id: Ic93b3933ce30808e2cf9c7a3af4688392f098a4a

Conflicts:
	arch/arm/mach-msm/Kconfig