preservative: by bedalus squashed

cpufreq: rename conservative preservative and mess with it

Conflicts:
	arch/arm/configs/cyanogen_mako_defconfig
	arch/arm/mach-msm/acpuclock-8064.c

preservative: make boost logic simpler and parameterise the optimal frequency

preservative: touch boost at 1242 MHz and lower optimal fq

...and remove one fq that is barely used

Conflicts:
	arch/arm/mach-msm/acpuclock-8064.c

Revert "preservative: touch boost at 1242 MHz and lower optimal fq"

This reverts commit 0e606d3a8896ee60b04f79aa62f90420e2cd291d.

Conflicts:
	arch/arm/mach-msm/acpuclock-8064.c

preservative: touch boost at 1242 MHz and lower optimal fq (without removing the unused frequency from the clock table)

hook cpu frequency into gpu control

Conflicts:
	drivers/gpu/msm/kgsl_pwrscale_trustzone.c

GPU: be less power mad!

GPU: try to get everything updating together

Conflicts:
	arch/arm/Kconfig
	arch/arm/configs/cyanogen_mako_defconfig
	drivers/gpu/msm/kgsl_pwrscale_trustzone.c

CPU and GPU tweaks for new 1.7GHz limit

preservative: add iowait discount

Revert "preservative: add iowait discount"

This reverts commit 13817fd287456eae881fbbfbf528b3f0d982ddb7.

preservative: make fq stay above 1134MHz to keep the bus speed high, add hysteresis to prevent spurius scaling below this point

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

preservative: allow 702MHz sleep and bring higher bus speeds down to 810MHz

Conflicts:
	arch/arm/mach-msm/acpuclock-8064.c
	arch/arm/mach-msm/msm_hotplug.c
	drivers/cpufreq/cpufreq_preservative.c

preservative: bring back all frequencies, no need to skip any as everything is solved in the clock tables now

preservative: change behaviour when asleep.

Get an early suspend hook from the hotplug driver to allow for
a drop the optimal frequency position. Drop opt_pos down to a level
where the bus speed is normal. Restore it when the device wakes (my
kernel uses mainly max bus speed when the device is not idle).

Allow scaling up to any fq even when asleep to ensure the dialer
app loads quickly.

Prevent touch events from boosting the fq when asleep.

Conflicts:
	arch/arm/mach-msm/msm_hotplug.c
	include/linux/cpufreq.h

experimental tweaks to idle fq; hotplug; preservative

Conflicts:
	arch/arm/mach-msm/acpuclock-8064.c
	arch/arm/mach-msm/msm_hotplug.c
	drivers/cpufreq/cpufreq_preservative.c

preservative: adjust scaling due to new low idle fq

preservative: change behaviour when asleep.

Get an early suspend hook from the hotplug driver to allow for
a drop the optimal frequency position. Drop opt_pos down to a level
where the bus speed is normal. Restore it when the device wakes (my
kernel uses mainly max bus speed when the device is not idle).

Allow scaling up to any fq even when asleep to ensure the dialer
app loads quickly.

Prevent touch events from boosting the fq when asleep.

Conflicts:
	arch/arm/mach-msm/msm_hotplug.c
	drivers/cpufreq/cpufreq_preservative.c
	include/linux/cpufreq.h

experimental tweaks to idle fq; hotplug; preservative

Conflicts:
	arch/arm/mach-msm/acpuclock-8064.c
	arch/arm/mach-msm/msm_hotplug.c
	drivers/cpufreq/cpufreq_preservative.c

preservative: adjust scaling due to new low idle fq

preservative: tidy up and increase rate

revert experimental changes

Conflicts:
	arch/arm/mach-msm/acpuclock-8064.c
	arch/arm/mach-msm/msm_hotplug.c
	drivers/gpu/msm/kgsl_pwrscale_trustzone.c

preservative: hook into GPU and bump optimum fq. to 810 MHz again

Conflicts:
	arch/arm/mach-msm/acpuclock-8064.c
	drivers/gpu/msm/kgsl_pwrscale_trustzone.c

Add 189 MHz
Add CPU_FREQ_GOV_PRESERVATIVE