Merge of Sony release 9.1.A.0.420

Change-Id: Ifada7b713fc5de4f229064ffac065e88813ea652

Conflicts:
	arch/arm/configs/blue_mint_defconfig
	arch/arm/mach-msm/Kconfig
	arch/arm/mach-msm/Makefile
	arch/arm/mach-msm/acpuclock-8960ab.c
	arch/arm/mach-msm/board-8064.c
	arch/arm/mach-msm/board-8930.c
	arch/arm/mach-msm/board-8960.c
	arch/arm/mach-msm/board-blue-display.c
	arch/arm/mach-msm/board-blue-display.h
	arch/arm/mach-msm/board-blue-storage.c
	arch/arm/mach-msm/board-blue.c
	arch/arm/mach-msm/board-blue_mint-camera.c
	arch/arm/mach-msm/board-blue_mint-gpiomux.c
	arch/arm/mach-msm/board-blue_mint-pmic.c
	arch/arm/mach-msm/board-blue_mint-regulator.c
	arch/arm/mach-msm/clock-8960.c
	arch/arm/mach-msm/devices-8960.c
	arch/arm/mach-msm/devices-iommu.c
	arch/arm/mach-msm/felica-blue_common.c
	arch/arm/mach-msm/gyro-sony_common.h
	arch/arm/mach-msm/include/mach/board.h
	arch/arm/mach-msm/include/mach/msm_serial_hs.h
	arch/arm/mach-msm/include/mach/socinfo.h
	arch/arm/mach-msm/irda-blue_common.c
	arch/arm/mach-msm/lpass-8960.c
	arch/arm/mach-msm/modem-8960.c
	arch/arm/mach-msm/platsmp.c
	arch/arm/mach-msm/ramdump.c
	arch/arm/mach-msm/restart.c
	arch/arm/mach-msm/socinfo.c
	arch/arm/mach-msm/sony_ssm.c
	arch/arm/mach-msm/subsystem_restart.c
	arch/arm/mach-msm/wcnss-ssr-8960.c
	arch/arm/tools/mach-types
	drivers/bluetooth/hci_ath.c
	drivers/char/diag/diagchar_core.c
	drivers/coresight/coresight-etm.c
	drivers/gpu/msm/kgsl.c
	drivers/hwmon/pm8xxx-adc-scale.c
	drivers/input/misc/Kconfig
	drivers/input/misc/Makefile
	drivers/input/misc/akm8972.c
	drivers/input/misc/apds9702.c
	drivers/input/misc/bma250_ng.c
	drivers/input/misc/mpu3050.c
	drivers/input/misc/pmic8xxx-pwrkey.c
	drivers/input/touchscreen/clearpad_rmi_dev.c
	drivers/leds/Kconfig
	drivers/leds/leds-as3676.c
	drivers/media/video/msm/Kconfig
	drivers/media/video/msm/gemini/msm_gemini_sync.c
	drivers/media/video/msm/msm.c
	drivers/media/video/msm/msm_mctl.c
	drivers/mfd/pm8921-core.c
	drivers/misc/Kconfig
	drivers/misc/Makefile
	drivers/misc/lm3560.c
	drivers/misc/mpu3050/mldl_cfg.c
	drivers/misc/mpu3050/mldl_cfg.h
	drivers/misc/mpu3050/mpu-dev.c
	drivers/misc/pm8xxx-vibrator.c
	drivers/misc/vibrator-lc898300.c
	drivers/net/pppolac.c
	drivers/net/pppopns.c
	drivers/power/pm8921-bms.c
	drivers/power/pm8921-charger.c
	drivers/staging/android/lowmemorykiller.c
	drivers/tty/serial/msm_serial_hs.c
	drivers/usb/gadget/android.c
	drivers/usb/gadget/ci13xxx_udc.c
	drivers/usb/gadget/f_audio_source.c
	drivers/usb/host/Makefile
	drivers/usb/host/host_ext_event.c
	drivers/usb/misc/Makefile
	drivers/usb/misc/mdm_data_bridge.c
	drivers/usb/otg/msm_otg.c
	drivers/video/msm/Kconfig
	drivers/video/msm/external_common.h
	drivers/video/msm/hdmi_msm.c
	drivers/video/msm/mdp.c
	drivers/video/msm/mdp.h
	drivers/video/msm/mdp4.h
	drivers/video/msm/mdp4_overlay.c
	drivers/video/msm/mdp4_overlay_dsi_cmd.c
	drivers/video/msm/mdp4_overlay_dsi_video.c
	drivers/video/msm/mdp4_overlay_dtv.c
	drivers/video/msm/mdp4_overlay_lcdc.c
	drivers/video/msm/mdp4_overlay_writeback.c
	drivers/video/msm/mdp_dma.c
	drivers/video/msm/mdp_dma_dsi_video.c
	drivers/video/msm/mdp_dma_lcdc.c
	drivers/video/msm/mipi_dsi.c
	drivers/video/msm/mipi_dsi_host.c
	drivers/video/msm/mipi_novatek.c
	drivers/video/msm/mipi_r63306_panels/mipi_sharp_ls043k3sx04.c
	drivers/video/msm/mipi_r63306_panels/mipi_tmd_mdw30.c
	drivers/video/msm/mipi_r63306_panels/mipi_tmd_mdx80.c
	drivers/video/msm/msm_fb.c
	drivers/video/msm/msm_fb.h
	include/linux/akm8972.h
	include/linux/apds9702.h
	include/linux/bma250_ng.h
	include/linux/bma250_ng_common.h
	include/linux/felica.h
	include/linux/mfd/pm8xxx/pm8921-bms.h
	include/linux/mfd/pm8xxx/pm8921-charger.h
	include/linux/mfd/pm8xxx/pm8921.h
	include/linux/mfd/wcd9xxx/core.h
	include/linux/mpu.h
	include/linux/msm_mdp.h
	include/linux/usb/msm_hsusb.h
	include/linux/usb/otg.h
	include/linux/vibrator-lc898300.h
	sound/soc/codecs/wcd9310.c
	sound/soc/msm/msm8960.c