P708 don't have NFC, so go off
Merge from THLG
	modified:   arch/arm/mach-msm/lge/m4/board-msm7x27a_m4.c
	modified:   arch/arm/mach-msm/lge/u0/board-msm7x27a_u0.c
	modified:   include/media/msm_gemini.h
MSM:PMEM: Fix msm_pmem_stats_vtop_lookup errors.

This is to fix the msm_pmem_stats_vtop lookup errors.

Signed-off-by: Ramesh Gupta G <rggupt@codeaurora.org>
Signed-off-by: Suresh Vankadara <svankada@codeaurora.org>
Signed-off-by: Chandan Gera <cgera@codeaurora.org>

Change-Id: I777364942609cdaaa290242d1f7d27cca3e96ed9
Signed-off-by: Srivalli Oguri <oguri@codeaurora.org>
MSM:Video: Enable debug logs for the error cases

This is to enable the error logs.
Fixed review comments from previous one
Change-Id: Ic829d01cbaabe26204435b1c31ed22f2db28f2b3
Signed-off-by: Suresh Vankadara <svankada@codeaurora.org>
Signed-off-by: Ramesh Gupta Guntha <rggupt@codeaurora.org>
Signed-off-by: Satish Kamuju <skamuj@codeaurora.org>
msm: camera: Add invalid pointer checks in mctl_pp

Added invalid pointer checks for frame handle and mem.

Change-Id: I3dd2c9a4c135e52f9c61aa9228715981238c1fd9
Signed-off-by: Sunid Wilson <sunidw@codeaurora.org>
(cherry picked from commit b449a2269fb7a329145de4b891c9ea14eb24d46d)

Signed-off-by: Dhivya Subramanian <dthiru@codeaurora.org>
msm: camera: add null check for VFE subdev

If vfe configuration is called after vfe subdev is
released, kernel crash happens, hence add null check
for vfe subdev.

Change-Id: I3060976b9735247d8f3e456aadbd5e5ca5f06c67
Signed-off-by: Roja Rani Yarubandi <rojay@codeaurora.org>
Enable XZ into kernel
	modified:   arch/arm/configs/cyanogenmod_u0_defconfig
Change branch name
	modified:   arch/arm/configs/cyanogenmod_u0_defconfig
	modified:   arch/arm/configs/cyanogenmod_u0_nonfc_defconfig
radio-tavarua: update to msm-3.4

AU_LINUX_ANDROID_JB_MR1.04.02.02.049.424

Change-Id: I930ccc9a3ab2471015069bdd6aa39d0018face5c

Conflicts:
	drivers/media/radio/radio-tavarua.c
	include/media/tavarua.h

	modified:   drivers/media/radio/radio-tavarua.c
	modified:   include/media/tavarua.h
Merge branch 'android-msm-3.4-kk-OC' of https://github.com/cr3pt/lge-kernel-lproj into cr3pt-android-msm-3.4-kk-OC

Conflicts:
	arch/arm/configs/cyanogenmod_u0_defconfig

	modified:   arch/arm/configs/cyanogenmod_u0_8m_defconfig
	modified:   arch/arm/configs/cyanogenmod_u0_defconfig
	modified:   arch/arm/configs/cyanogenmod_u0_nonfc_defconfig
	modified:   arch/arm/mach-msm/lge/m4/board-msm7x27a_m4.c
	modified:   arch/arm/mach-msm/lge/u0/board-msm7x27a_u0.c
	modified:   drivers/media/radio/radio-tavarua.c
	modified:   drivers/media/video/msm/msm.c
	modified:   drivers/media/video/msm/msm_isp.c
	modified:   drivers/media/video/msm/msm_mctl_pp.c
	modified:   drivers/media/video/msm/msm_mem.c
	modified:   include/media/msm_gemini.h
	modified:   include/media/tavarua.h