Squash  Merge tag 'AU_LINUX_ANDROID_JB_2.6.04.03.00.109.111' into cm-10.2-dev AU_LINUX_ANDROID_JB_2.6.04.03.00.109.111 based on quic/aosp/jb_2.6
credits @intervigilium

Conflicts:
	arch/arm/Kconfig
	arch/arm/configs/ville_defconfig
	arch/arm/mach-msm/Kconfig
	arch/arm/mach-msm/htc/htc_battery_8960.c
	arch/arm/mach-msm/htc/ville/board-ville.c
	drivers/gpu/msm/adreno.c
	drivers/gpu/msm/adreno.h
	drivers/gpu/msm/adreno_ringbuffer.c
	drivers/leds/leds-pm8xxx-htc.c
	drivers/video/msm/mdp4_overlay.c
msm:pm: Fix for race condition of starting cpu1 when cpu0 in PC.

There is a window where core sends ipi to secondary core and
wait for it to come online for 1 second. This would allow
core0 to go power collapse in a rare condition where core1
started booting and doesn't become online yet.

Fix this by not allowing power collapse on core0
if hot plug operation is in progress.

CRs-fixed: 545714.
Change-Id: I1ca503a2f09cd9a65c2fdcd41eb54466a1e486c5
Signed-off-by: Anil kumar mamidala <amami@codeaurora.org>
removed thermal management by showp
intelli/msm_thermal: initial coding for Qualcomm S4 Pro devices

an intelligent MSM thermal throttling kernel driver designed to replace the
closed sourced thermald(aemon) from Qualcomm.

The current driver can throttle the SOC via core frequency scaling or via
core hotplug with user configurable sysfs entries to adjust the throttling
temperature thresholds for each.

Derived from Qualcomm's Open source repo.

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

Conflicts:
	arch/arm/mach-msm/lge/mako/board-mako.c
	include/linux/msm_thermal.h
intelli-thermal: fix stats calculations

Signed-off-by: Paul Reioux <reioux@gmail.com>
driver: touchscreen: cypress: Add doubletap2wake by @flar2
Squashed update kernel version from 3.4.67 to 3.4.68