fs:Kconfig: rework to silence warning
fastcharge: import fastcharge for msm8960 devices

Conflicts:
	arch/arm/mach-msm/Kconfig
	arch/arm/mach-msm/Makefile
Fix fastcharge
sleepy_plug: initial coding of sleepy_plug,
an cpu hotplug driver for dual core devices based on intelli_plug

Conflicts:
	arch/arm/mach-msm/Kconfig
	arch/arm/mach-msm/Makefile
Fix from sleepy_plug commit
sleepy_plug: remove unused pr_info
sleepy_plug: boots on sudden request and some clean
sleepy_plug: switch to use dedicated high priority workqueue

from the shared global workqueue.  This should prevent hang ups while the
global workqueue is busy and cleaned up some logic issues.

thanks to @faux123 for the idea
sleepy_plug: use early_suspend, we haven't got powersuspend atm
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

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

powersuspend: fix logci derps :p

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

Conflicts:
	kernel/power/Kconfig
	kernel/power/Makefile
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>

Conflicts:
	kernel/power/autosleep.c
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>
use powersuspend when needed

Conflicts:
	fs/dyn_sync_cntrl.c
	init/Kconfig
	kernel/cgroup_timer_slack.c
	mm/page-writeback.c
kernel/power/powersuspend: default to kernel
sleepy_plug: code cleanup
cy8c_cs: remove early_suspend stuff

Conflicts:
	drivers/input/touchscreen/cy8c_cs.c
Fix
cy8c_cs: proper handling of powersuspend
migrate everything to powersuspend.
this is the result of
find ./ -type f -exec sed -i -e 's/early_suspend/power_suspend/g' {} \;
find ./ -type f -exec sed -i -e 's/earlysuspend/powersuspend/g' {} \;
find ./ -type f -exec sed -i -e 's/CONFIG_HAS_EARLYSUSPEND/CONFIG_POWERSUSPEND/g' {} \;
and some fixes by hand

Conflicts:
	arch/arm/mach-msm/board-mahimahi-flashlight.c
	arch/arm/mach-msm/board-mahimahi-microp.c
	arch/arm/mach-msm/cpufreq.c
	arch/arm/mach-msm/htc/elite/board-elite.c
	arch/arm/mach-msm/htc/htc_battery_8960.c
	arch/arm/mach-msm/htc/htc_headset_mgr.c
	arch/arm/mach-msm/htc/ville/board-ville.c
	arch/arm/mach-msm/htc_pwrsink.c
	arch/arm/mach-msm/include/mach/htc_pwrsink.h
	arch/arm/mach-msm/msm_mpdecision_showp.c
	arch/arm/mach-msm/qdsp6v2/audio_lpa.c
	arch/arm/mach-msm/qdsp6v2/audio_lpa.h
	drivers/input/joystick/tdisc_vtd518_shinetsu.c
	drivers/input/misc/akm8975.c
	drivers/input/misc/bma250.c
	drivers/input/misc/bmp18x-core.c
	drivers/input/misc/cm3629.c
	drivers/input/touchscreen/atmel_maxtouch.c
	drivers/input/touchscreen/cy8c_tmg_ts.c
	drivers/input/touchscreen/cy8c_ts.c
	drivers/input/touchscreen/ft5x06_ts.c
	drivers/input/touchscreen/lge_touch_core.c
	drivers/input/touchscreen/msm_ts.c
	drivers/input/touchscreen/synaptics_i2c_rmi.c
	drivers/input/touchscreen/synaptics_i2c_rmi4.h
	drivers/input/touchscreen/touch_synaptics.c
	drivers/input/touchscreen/touch_synaptics_ds4_fw_upgrade.c
	drivers/input/touchscreen/tsc2007.c
	drivers/leds/leds-msm-pdm.c
	drivers/leds/ledtrig-sleep.c
	drivers/leds/tps61310_flashlight.c
	drivers/media/video/msm/rawchip/rawchip.h
	drivers/mfd/marimba-tsadc.c
	drivers/misc/akm8975.c
	drivers/mmc/host/msm_sdcc.h
	drivers/net/ethernet/msm/msm_rmnet.c
	drivers/net/ethernet/msm/msm_rmnet_sdio.c
	drivers/net/ethernet/msm/msm_rmnet_smux.c
	drivers/net/wireless/bcm4329/dhd_linux.c
	drivers/net/wireless/bcmdhd/dhd_cfg80211.c
	drivers/net/wireless/bcmdhd/dhd_linux.c
	drivers/power/msm_battery.c
	drivers/staging/prima/CORE/HDD/src/wlan_hdd_early_suspend.c
	drivers/staging/prima/CORE/HDD/src/wlan_hdd_main.c
	drivers/staging/prima/CORE/HDD/src/wlan_hdd_wext.c
	drivers/staging/prima/CORE/VOSS/src/vos_sched.c
	drivers/video/backlight/lm3533.c
	drivers/video/msm/mddi.c
	drivers/video/msm/mddi_ext.c
	drivers/video/msm/sii9234/sii9234.c
	include/linux/earlysuspend.h
	include/linux/htc_flashlight.h
	include/linux/input/lge_touch_core.h
	include/linux/rmi.h
	kernel/power/consoleearlysuspend.c
	kernel/power/earlysuspend.c
	kernel/power/fbearlysuspend.c