jf: cypress-touchkey - add keydisabler

Change-Id: I85efd4c5b2d6a7283c430f5eca2a730ef6b03d18
Merge "jf: cypress-touchkey - add keydisabler" into cm-11.0
[media] media-device: fix infoleak in ioctl media_enum_entities()

This fixes CVE-2014-1739.

Change-Id: Ie7f5ceb6f8e85943176bb180b273e90e03f551d8
Signed-off-by: Salva Peiró <speiro@ai2.upv.es>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: stable@vger.kernel.org
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Revert "gpu: msm2: Sync with upstream"

This reverts commit 5f1966021b469f7c189e7628d8c748919b01f8e2.

Revert "msm: We are using the msm2 gpu driver, not msm"

This reverts commit 34b44d5cf2ef7a3442d69712d42bfd547297abeb.

Revert "iommu/core: pass a user-provided token to fault handlers"

This reverts commit 73c8716e574473837cbedc74b10ee83fc2f51d66.

Revert "msm: kgsl: Add intermediate power levels"

This reverts commit e9d771eb241c6d36ef36dce9ceb493b9eba4d945.

Revert "msm: kgsl: Add separate GPU shader memory mapping"

This reverts commit b90cfb017e30c36bb2dcd02dedb358637a533dc1.

Revert "gpu: msm: Add new Adreno driver"

This reverts commit 948ae82369f7bbbd57ae6f3b9f9e250d571b7e5d.

msm: mdp: Update sync pt. behaviour

Add a retire fence and clean up the existing release fence
implementation

Signed-off-by: Naseer Ahmed <naseer@codeaurora.org>
Change-Id: Iecf7e95d0786ac43aa6a12d70442936600c0249a

msm: vidc: Initialize kernel space stack variables

This change initializes kernel space stack variables
that are passed between kernel space and user space
using ioctls.
Non initialization of these variables may lead to
leakage of memory values from the kernel stack to
user space.

Change-Id: If2ad6b9672081e94b52d17d969858abf8bd4c4dc
CRs-fixed: 556771,563420
Signed-off-by: Deepak Verma <dverma@codeaurora.org>
Revert "msm: mdp: Update sync pt. behaviour"

This reverts commit 9d76c84cfe7ef07c9e588d72940127100e31365b.
jf: rename defconfig

Change-Id: If5d2ac10f977e4e99e3e7de0f4784b3c993b9bbb
jf: debrand defconfig

Change-Id: If63f848f99b65e1b13e64a8f3f38d3e9d26faf3c