in nexus 4 8921_l6 regulates earjack_debug but in E970 it regulates msm_sdcc.3 (external sdcard)
fixed missing coma
use CONFIG_MMC_MSM_SDC3_SUPPORT to choose between sdc3 and earjack debug
drivers for PN544 NFC
add PN544 NFC support
geeb config
fix compilation erros
synaptic drivers from LGE with capacitive buttons support
Conflicts:
	drivers/input/touchscreen/SynaImage.h
	drivers/input/touchscreen/lge_touch_core.c
	drivers/input/touchscreen/touch_synaptics.c
	include/linux/input/lge_touch_core.h
leds/pwm drivers for E970 from LGE
Conflicts:
	drivers/leds/leds-qpnp.c
support for capacitive buttons
Conflicts:
	arch/arm/mach-msm/lge/mako/board-mako-input.c
leds for capacitive buttons
Conflicts:
	arch/arm/mach-msm/lge/mako/board-mako-pmic.c
support for leds/cap buttons for geeb
reverse VOLUMEUP and VOLUMEDOWN on kernel level
msm_fb: hdmi: Resolution modes on HDMI

Add a new header file that lists all supported
HDMI resolution modes and the associated timing
information.

Change-Id: I38261abebeb4602dc1d780def6cb23a0e186234f
CRs-Fixed: 470335
Signed-off-by: Aravind Venkateswaran <aravindh@codeaurora.org>
Signed-off-by: Manoj Rao <manojraj@codeaurora.org>
add green led support
Use standard EAR_SENSE GPIO for all harware revs if CONFIG_MACH_APQ8064_J1A is defined: required for E971/3
MHL support
Conflicts:
	drivers/video/msm/external_common.c
msm_mdp: update the header to be compatible with cm qcom/display drivers and matching android userspace header
This isn't matched with MDP, but userspace (qcom/display) is built
with this copy, and the mismatch is generating artifacts
fix compiler warning
Merge branch 'jb_mr2' into jb_mr2_geeb: update to r2.1

Conflicts:
	include/linux/msm_mdp.h