Add missing line to P505/6 config (argh...)

Change-Id: If83895afc12a1c18c0fe716b194495a2394efd15
Signed-off-by: Rashed Abdel-Tawab <rashedabdeltawab@gmail.com>
Fix hitachi display table for first init (sets column/page address)

No more empty lines(2px) on top for hitachi (#blame_rashed)

Change-Id: I0fd733604107fbd974940f92e66ad2abf72ff760
Get rid of novatek (2/2)

Change-Id: If4f60cff6cb02eb53ea11d5b89a7e75e724c5a63
Don't use CONFIG_FB_MSM_MDDI_HITACHI_HVGA_LCD_WORKAROUND for P509 (2/2)
Use CONFIG_FB_MSM_MDDI_HITACHI_HVGA_LCD_WORKAROUND for P500

Change-Id: Ic8cccfd77564962094ad06ee68a18d61a81bcdf8
Revert "Get rid of novatek (2/2)"

This reverts commit fe8c8002cc810f98c43197161c6ee682433a70e5.

Conflicts:

	arch/arm/configs/cyanogenmod_p500_defconfig

Change-Id: I6cf9b8a7ade3eab238ac3592736f93884a3205e1
Start wlan after deep-sleep

Change-Id: Ib8398aa0b48ae5bff23903691e711fd71f30de2a
bcm4325: Move sources into main folder

For easier patching and comparing of changes with bcmdhd.

Change-Id: I87072bc27605a970ceccf4a64a7997e17138c2d9
bcm4325: Delete unnecessary files

Change-Id: I1b17143c879db801aecbd49e5b0c18fff42ea303
Hack for CRT animations fix

Change-Id: I68abc2d02e2c5e3a2df4ec5977d3251fe84b43c0
Signed-off-by: Rashed Abdel-Tawab <rashedabdeltawab@gmail.com>
bcm4325: Clean-up for BCMDONGLEHOST

Change-Id: Ifeb587624496156017aa0f099f93166147b4a961
Revert "Enable deep sleep on BCM4325"

This reverts commit 2717a396ea1dd81d24ed894f96ee725bc9e84eaa.
CVE-2013-2094, CVE-2012-4220, CVE-2012-4221, CVE-2012-4222, CVE-2013-2596, CVE-2013-2595

https://www.codeaurora.org/projects/security-advisories

perf: Treat attr.config as u64 in perf_swevent_init()

Trinity discovered that we fail to check all 64 bits of
attr.config passed by user space, resulting to out-of-bounds
access of the perf_swevent_enabled array in
sw_perf_event_destroy().

Introduced in commit b0a873ebb ("perf: Register PMU
implementations").

Signed-off-by: Tommi Rantala <tt.rantala@gmail.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: davej@redhat.com
Cc: Paul Mackerras <paulus@samba.org>
Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Link: http://lkml.kernel.org/r/1365882554-30259-1-git-send-email-tt.rantala@gmail.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>

msm: msm_fb: remove mmio access through mmap

Disable access to mm io and add
appropriate range checks to ensure valid accesses
through framebuffer mmap. This prevents illegal
access into memory.

CRs-Fixed: 474706
Change-Id: If25166f2732433ef967e99c716440030b567aae9
Signed-off-by: Manoj Rao <manojraj@codeaurora.org>
(cherry picked from commit b571bef36cf51f9bb4cd1ad3ba23e3cee6d1d3cb)

Conflicts:

	drivers/video/msm/msm_fb.c

Signed-off-by: Raviteja <adimur@codeaurora.org>

msm: camera: Remove unused code used to map userspace buffers.

Remove MSM_CAM_IOCTL_SET_MEM_MAP_INFO IOCTL support, since the
usage of this IOCTL is now depreciated.

Change-Id: I8d0c99874ae9bd87aaaa10e039f2511a6dd20775
Signed-off-by: Kiran Kumar H N <hurlisal@codeaurora.org>

msm: kgsl: Detect and avoid malformed ioctl codes

Because we were using _IO_NR, one could construct a malformed ioctl
code that would avoid allocating memory yet go to a function that
expected that memory. Still use _IO_NR to index the array of ioctls,
but check that the full values match before jumping to the helper
function.

CRs-fixed: 385592
Change-Id: Ic0dedbaded469035bd0a2bb0f20fecb2a3045ca5
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
p500: Enable selinux support

Change-Id: I5f52d46953b594f877dc573bd2ab16a9368bd3ae
Revert "p500: Enable selinux support"

This reverts commit e76bb3d0cd285b52f326433b3a73bb671c22994e.
p50x: Enable SWAP

Finally enable SWAP. This should help ;)

Change-Id: I4ce70bc41adffe410f78d6ce3633c3ad29a46ee3
Signed-off-by: Rashed Abdel-Tawab <rashedabdeltawab@gmail.com>
Merge branch 'cm-10.1' of https://github.com/androidarmv6/android_kernel_lge_msm7x27-3.0.x into v4.2

Conflicts:
	arch/arm/configs/cyanogenmod_p500_defconfig
	arch/arm/configs/cyanogenmod_p500_p509_defconfig
	arch/arm/configs/cyanogenmod_p509_defconfig