drivers/cpufreq: fix merge derp in Kconfig

Change-Id: I9d445c049cb72b3fca6ad98f4b28c39fa1f2fe25
mach-msm: fix merge derp in Makefile

Change-Id: I2376e095d462badd7d1d7dd8ee8d0d827cfee3a8
intellidemand: remove outdated additions in cpufreq.c (mainly things related to early_suspend)

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

Change-Id: If889e46e5b606c8b91cd830d18fb70ecd731db28
interactiveX2 governor: remove early_suspend stuff
smartassV2 governor: fix build by removing early_suspend-related stuff
lagfree governor: remove early_suspend stuff
kernel/power/powersuspend: new PM kernel driver for Android w/o early_suspend

Android early_suspend/late_resume PM kernel driver framework has been
deprecated by Google. This new powersuspend PM kernel driver is a replacement
for it and existing early_suspend drivers can be easily adapted to use this
new replacement driver

Signen-off-by: Paul Reioux <reioux@gmail.com>
powersuspend: fix logci derps :p

Signed-off-by: Paul Reioux <reioux@gmail.com>
kernel/power/powersuspend: remove userspace dependency from powersuspend

make powersuspend not depend on a userspace initiator anymore, but use a hook
in autosleep instead.

Signed-off-by: Paul Reioux <reioux@gmail.com>
kernel/power/powersuspend: add back userpace control w/ default kernel control

make kernel / userspace mode switchable

Signed-off-by: Paul Reioux <reioux@gmail.com>
kernel/power/powersuspend: default to userspace for now

Signed-off-by: Paul Reioux <reioux@gmail.com>
defconfig: enable PowerSuspend

Change-Id: I936f549327264db1295812c96296ba279dd13688
intelli_plug: update to latest version

Change-Id: Ia2a314da0285fb69cd97a330bab9b22ddd122972
scheduler: compute time-average nr_running per run-queue

Compute the time-average number of running tasks per run-queue for a
trailing window of a fixed time period. The detla add/sub to the
average value is weighted by the amount of time per nr_running value
relative to the total measurement period.

Change-Id: I076e24ff4ed65bed3b8dd8d2b279a503318071ff
Signed-off-by: Diwakar Tundlam <dtundlam@nvidia.com>
(cherry picked from commit 3a12d7499cee352e8a46eaf700259ba3c733f0e3)
Reviewed-on: http://git-master/r/111635
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Sai Gurrappadi <sgurrappadi@nvidia.com>
Tested-by: Sai Gurrappadi <sgurrappadi@nvidia.com>
Reviewed-by: Peter Boonstoppel <pboonstoppel@nvidia.com>
Reviewed-by: Yu-Huan Hsu <yhsu@nvidia.com>

forward ported to Linux 3.4 for use on S-800

Signed-off-by: Paul Reioux <reioux@gmail.com>
cpufreq: fix compilation errors

Change-Id: Iec7544708a6116fc568c6043cdcfefda37ca81d3