arch-msm: lge: mako: fix disabling CONFIG_EARJACK_DEBUGGER
msm: lge: mako: pmic: fix build when wireless charger is disabled
msm: lge: mako: pmic: fix gpios and add mpps
msm: lge: mako: allow disabling nfc
aries doesn't need it and it breaks audio because it uses the same gpios
arch-msm: lge: mako: fix gpio configs for aries
video: msm: add mipi_cmd_hitachi_720p panel driver

Conflicts:

	drivers/video/msm/Kconfig
	drivers/video/msm/Makefile
arch-msm: lge: mako: add regulators for aries's display
arch-msm: lge: mako: update code for enable/disable lcd panel
leds-lm3530: fixes for aries
video: msm: mipi_renesas: add commands for enable/disable lcd on aries
arch-msm: lge: mako: use lm3530-led instead of backlight driver
arch-msm: lge: mako: switch to mipi_cmd_hitachi_720p panel driver
input: touchscreen: atmel_mxt_ts: fix NULL for aries
arch-msm: lge: mako: fix touchscreen for aries

Conflicts:

	arch/arm/mach-msm/lge/mako/board-mako-input.c
arch-msm: lge: mako: disable splash to fix vsync issues on aries
audio: add es310 voice processor and enable it for mako
ASoC: msm: add support for es310

Conflicts:

	sound/soc/msm/apq8064.c
ASoC: wcd9310: add fixes for aries
board: mako: add clocks for es310 audio chip

Conflicts:

	arch/arm/mach-msm/clock-8960.c
arch-msm: lge: mako: add gsbi5 uart for es310 control

Conflicts:

	arch/arm/mach-msm/devices-8064.c
	arch/arm/mach-msm/devices.h