Merge remote-tracking branch 'korg/linux-3.4.y' into cm-11.0

Change-Id: I1c8cefd404c0cba611c5c4cb4700f6c68bd130af
Merge "msm: wfd: Free ion memory properly during a ion failure"
Merge "msm_fb: Register frame buffer device for device shutdown"
Merge "kernel:Dont set stop_issued flag in stop recording"
msm: gemini: Reset the core incase of overflow error

Reset the gemini core for the overflow usecases.

Change-Id: I64b4283806d67615b2963e0d6a42f04a40d6a892
Signed-off-by: Sunid Wilson <sunidw@codeaurora.org>
Merge "Merge "misc: qfpfuse: validate ioctl input parameters""
Merge "Merge "Merge "misc: qfpfuse: validate ioctl input parameters"""
Merge "Merge "kernel:Dont set stop_issued flag in stop recording""
Merge "Merge "Merge "kernel:Dont set stop_issued flag in stop recording"""
Merge "Merge "kernel:Dont set stop_issued flag in stop recording""
Merge "Merge "Merge "kernel:Dont set stop_issued flag in stop recording"""
ARM: 7735/2: Preserve the user r/w register TPIDRURW on context switch and fork

Since commit 6a1c53124aa1 the user writeable TLS register was zeroed to
prevent it from being used as a covert channel between two tasks.

There are more and more applications coming to Windows RT,
Wine could support them, but mostly they expect to have
the thread environment block (TEB) in TPIDRURW.

This patch preserves that register per thread instead of clearing it.
Unlike the TPIDRURO, which is already switched, the TPIDRURW
can be updated from userspace so needs careful treatment in the case that we
modify TPIDRURW and call fork(). To avoid this we must always read
TPIDRURW in copy_thread.

Change-Id: Ib1e25be7b9faa846ba5335aad2574e21a1246066
Signed-off-by: André Hentschel <nerv@dawncrow.de>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Jonathan Austin <jonathan.austin@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Git-commit: a4780adeefd042482f624f5e0d577bf9cdcbb760
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
[joonwoop@codeaurora.org: fixed merge conflict]
CRs-fixed: 561044
Signed-off-by: Joonwoo Park <joonwoop@codeaurora.org>
msm: kgsl: Fix Z180 memory leak

Decerement entry refcount, which incremented
in kgsl_sharedmem_find_region.

CRs-Fixed: 635747
Change-Id: I621ba8f8e119a9ab8ba5455b28a565e3cae2f7cd
Signed-off-by: Hareesh Gundu <hareeshg@codeaurora.org>
msm: kgsl: fix a race condition when calling kref_put

Fix a race condition which can occur if a thread tries to acquire
a reference to a mem_entry or context while another thread has
already decremented the refcount to 0 and is in the process of
destroying said mem_entry or context.

CRs-Fixed: 635747
Change-Id: I6be64ca75f9cb12b03e870b9ca83588197c64e5e
Signed-off-by: Hareesh Gundu <hareeshg@codeaurora.org>
Merge "msm: kgsl: Fix Z180 memory leak"
defconfig: msm8960: Enable CONFIG_NL80211_TESTMODE in perf config

Enable parameter CONFIG_NL80211_TESTMODE in the perf configuration
file to enable test mode.

Change-Id: Ib395f5e7ab2250dd48794e89d327098edfb4653d
CRs-fixed: 639658
Signed-off-by: Dasari Srinivas <dasaris@codeaurora.org>
Merge "msm: kgsl: fix a race condition when calling kref_put"
Merge "Merge "msm: kgsl: Fix Z180 memory leak""
d2: camera: Finish fixing video enable/disable sequence

Change-Id: Id03a18aec8acafc78d018b09f23b7f924ff5083e
cpufreq: interactive: delete timers for GOV_START

Make sure that timers cpu_timer and cpu_slack_timer
deactivated before addition of new.

Change-Id: If31c4049606871df6f00efdc24b1d713c86a6f69
Signed-off-by: Shridhar Rasal <srasal@nvidia.com>
Signed-off-by: Bharat Nihalani <bnihalani@nvidia.com>
Git-commit: b430123367e78a6557bac3cf1558bcb85193fb12
Git-repo: https://android.googlesource.com/kernel/common/
[mattw@codeaurora.org: resolved trivial context conflict]
Signed-off-by: Matt Wagantall <mattw@codeaurora.org>