Overlay Pantech P9090 on mako

Conflicts:
	arch/arm/kernel/process.c
	arch/arm/mach-msm/acpuclock-8960.c
	arch/arm/mach-msm/acpuclock-krait.c
	arch/arm/mach-msm/bms-batterydata.c
	arch/arm/mach-msm/board-8960-display.c
	arch/arm/mach-msm/board-8960-gpiomux.c
	arch/arm/mach-msm/board-8960-regulator.c
	arch/arm/mach-msm/board-8960.c
	arch/arm/mach-msm/clock-8960.c
	arch/arm/mach-msm/devices-8960.c
	arch/arm/mach-msm/devices.h
	arch/arm/mach-msm/include/mach/camera.h
	arch/arm/mach-msm/modem-8960.c
	arch/arm/mach-msm/msm_dsps.c
	arch/arm/mach-msm/restart.c
	arch/arm/mach-msm/socinfo.c
	arch/arm/tools/mach-types
	drivers/gpu/msm/adreno_ringbuffer.c
	drivers/hwmon/pm8xxx-adc-scale.c
	drivers/input/misc/pmic8xxx-pwrkey.c
	drivers/input/touchscreen/Makefile
	drivers/leds/leds-pm8xxx.c
	drivers/media/video/msm/Kconfig
	drivers/media/video/msm/Makefile
	drivers/media/video/msm/actuators/msm_actuator.c
	drivers/media/video/msm/flash.c
	drivers/media/video/msm/msm.c
	drivers/media/video/msm/msm_gesture.c
	drivers/media/video/msm/msm_mctl.c
	drivers/media/video/msm/sensors/Makefile
	drivers/media/video/msm/sensors/msm_sensor.c
	drivers/media/video/msm/sensors/msm_sensor.h
	drivers/misc/Kconfig
	drivers/misc/Makefile
	drivers/mmc/core/mmc.c
	drivers/mmc/host/msm_sdcc.c
	drivers/power/Makefile
	drivers/power/pm8921-charger.c
	drivers/switch/Kconfig
	drivers/switch/Makefile
	drivers/usb/gadget/android.c
	drivers/usb/gadget/u_bam.c
	drivers/usb/otg/msm_otg.c
	drivers/video/msm/Kconfig
	drivers/video/msm/Makefile
	drivers/video/msm/external_common.c
	drivers/video/msm/hdmi_msm.c
	drivers/video/msm/mdp.c
	drivers/video/msm/mdp4.h
	drivers/video/msm/mdp4_overlay.c
	drivers/video/msm/mdp4_overlay_dsi_video.c
	drivers/video/msm/mdp4_overlay_dtv.c
	drivers/video/msm/mipi_dsi.c
	drivers/video/msm/mipi_dsi_host.c
	drivers/video/msm/msm_dss_io_8960.c
	drivers/video/msm/msm_fb.c
	include/linux/mfd/pm8xxx/pm8921-bms.h
	include/linux/msm_mdp.h
	include/linux/usb/msm_hsusb.h
	include/media/msm_camera.h
	include/sound/q6asm.h
	net/bluetooth/l2cap_core.c
	net/bluetooth/sco.c
	sound/soc/codecs/wcd9310.c
	sound/soc/msm/qdsp6/q6afe.c
	sound/soc/msm/qdsp6/q6asm.c