Revert "Revert "(3/x): big thx to @franciscofranco for his generic touchboost driver""

This reverts commit 3af07ff57baffb81a213f7434ef8d750b94516ac.
Revert "Revert "touchboost: gpu_idle stays false now for at least 20 * 5 ms""

This reverts commit 99a452c61e11a625d17658395db889527d87af75.
Revert "Revert "(4/x): input: removed toucbhoost_func""

This reverts commit 8529cb61ae261b749d8fa4db4688271053a6b597.
Revert "Revert "Revert "atmel_mxt1188S: Consolidate input report calls"""

This reverts commit 004645bad472bf339a0382552adbc3a87140071f.
Linux 3.4.85
Added Voltage interface for GPU - Thanks KT

Conflicts:
	drivers/cpufreq/cpufreq.c
overall_stats: add overall stats for all available cores

this is much more accurate stats tracking than just displaying core 0's
stats from most other kernels

Signed-off-by: faux123 <reioux@gmail.com>
overall_stats: make dual/quad core stats configurable via meunconfig

Signed-off-by: faux123 <reioux@gmail.com>
overall_stats: forward port to kernel 3.4+

by replacing deprecated functions with native add/sub for 64bit data types

Signed-off-by: faux123 <reioux@gmail.com>
prima: wcnss: adapted from jb_3.2.1 caf to fix errors for building prima

@thanks chadouming

Conflicts:
	drivers/net/wireless/wcnss/wcnss_wlan.c
	include/linux/wcnss_wlan.h
prima: release v3.2.3.2

	git://codeaurora.org/external/wlan/prima.git

	893da90 wlan : Revision 3.2.3.2
	680abeb wlan: Enable TDLS for the drivers build as part of the kernel
	dd16d53 wlan: update sched_scan_results after cfg80211 resumed
	f6999ad wlan: Return success while stoping sched scan.
	969abac wlan: wiphy->bands[] can be null.
	e688ce3 wlan: GO should not follow STA channel if channel is passive.
	ae2bb79 wlan:Block WiFi Direct GO mode on UNII-1 Band.
	ab378f7 wlan: set appropriate flags for wiphy device based on current regdomain
	2692073 wlan: Revision 3.2.3.1
	f464d79 wlan: Update value of WLAN_HAL_PNO_MAX_NETW_CHANNELS
	fb72387 wlan: Update SME scan cache with PNO candidate information.
	da3fd7c wlan: Update definition of tPrefNetwFoundParams.
	571c5e9 Porting prima source from 2.6

Signed-off-by: Iliyan Malchev <malchev@google.com>

Conflicts:
	drivers/staging/prima/CORE/HDD/src/wlan_hdd_hostapd.c
	drivers/staging/prima/CORE/HDD/src/wlan_hdd_main.c
prima: release v3.2.3.2

This drop includes the gCfgEntry cherry-pick

	git://codeaurora.org/external/wlan/prima.git

	069ea26 prima: check for gCfgEntry being NULL
	893da90 wlan : Revision 3.2.3.2
	680abeb wlan: Enable TDLS for the drivers build as part of the kernel
	dd16d53 wlan: update sched_scan_results after cfg80211 resumed
	f6999ad wlan: Return success while stoping sched scan.
	969abac wlan: wiphy->bands[] can be null.
	e688ce3 wlan: GO should not follow STA channel if channel is passive.
	ae2bb79 wlan:Block WiFi Direct GO mode on UNII-1 Band.
	ab378f7 wlan: set appropriate flags for wiphy device based on current regdomain
	2692073 wlan: Revision 3.2.3.1
	f464d79 wlan: Update value of WLAN_HAL_PNO_MAX_NETW_CHANNELS
	fb72387 wlan: Update SME scan cache with PNO candidate information.
	da3fd7c wlan: Update definition of tPrefNetwFoundParams.
	571c5e9 Porting prima source from 2.6
	4990d1c Wlan: Release 3.2.2.17B
	d6b217f wlan: DTIM3 changed to DTIM1 after roaming
	f83a6cd Wlan: Release 3.2.2.17A
	2f45a43 Fix for "crash in pMac->cfg.gCfgEntry"
	c8faf30 wlan: Change regulatory followed customer request
	82e75bf wlan: Add msecs_to_jiffies() to wake lock argument
	f1bb518 Revert "wlan: Release 3.2.2.18"
	a65fc60 Revert "wlan: Set the country code in cfg before creating channel list."
	d235ff4 Revert "wlan: Release 3.2.2.19"
	2742bc2 Revert "wlan: Decrease SAP timeout from 100 to 10 seconds"
	768b6f5 Revert "wlan: Change RX wakelock to 50 milliseconds"
	4edbdc7 Revert "wlan: Fix for spectrum management bit in AddBss for SM disabled AP"
	2b46b25 Revert "wlan: Release 3.2.2.20"
	0647d89 wlan: Release 3.2.2.20
	e1c76a3 wlan: Fix for spectrum management bit in AddBss for SM disabled AP
	b8493a3 wlan: Change RX wakelock to 50 milliseconds
	476a501 wlan: Decrease SAP timeout from 100 to 10 seconds
	c883f13 wlan: Release 3.2.2.19
	4dbdab2 wlan: Set the country code in cfg before creating channel list.
	7cabdd8 wlan: Release 3.2.2.18

Signed-off-by: Iliyan Malchev <malchev@google.com>

Conflicts:
	drivers/staging/prima/CORE/HDD/src/wlan_hdd_hostapd.c
	drivers/staging/prima/CORE/HDD/src/wlan_hdd_main.c
	drivers/staging/prima/CORE/MAC/inc/qwlan_version.h
	drivers/staging/prima/CORE/VOSS/src/vos_nvitem.c
	drivers/staging/prima/CORE/WDI/WPAL/inc/wlan_qct_os_trace.h
msm: kgsl: added limits to gpu voltages userspace
msm: kgsl: rework naming convention for gpu undervolt userspace
msm: kgsl: disable debug for gpu undervolt userspace
msm: kgsl: remove unused for gpu undervolt userspace
msm: kgsl: Remove sscanf() from kgsl_pwrctrl.c

Replace sscanf() in kgsl_pwrctrl.c with a generic function to safely
convert 32 bit unsigned ints.

CRs-fixed: 563585
Change-Id: Ic0dedbad10e2264ec8fccab622d094d123b49b77
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>

Conflicts:

	drivers/gpu/msm/kgsl_device.h
	drivers/gpu/msm/kgsl_pwrctrl.c

Signed-off-by: Paul Reioux <reioux@gmail.com>
msm: kgsl: don't use sscanf()

Friends do not let friends use sscanf().

CRs-Fixed: 563605
Change-Id: Ic0dedbad56af5bbee4fc833701d8bc93b118efa9
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
power: don't wait for timeout if sys_sync completes early

In some cases the suspend thread is waiting for timer to expire
even if the sync workqueue is empty. So the suspend is taking extra
time.
To avoid this waiting, sending the completion event from
last sync item in workqueue.

CRs-Fixed: 583016

Change-Id: Ia3219e90762ec7f6ad3e7096126832acfd03ed69
Signed-off-by: Srinivasarao P <spathi@codeaurora.org>
FS: import F2FS

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