Merge tag 'M8974AAAAANLYA31050170' into custom

"M8974AAAAANLYA31050170"

Conflicts:
	Makefile
	arch/arm/boot/dts/msm-pm8941.dtsi
	arch/arm/boot/dts/msm8974-camera.dtsi
	arch/arm/boot/dts/msm8974-leds.dtsi
	arch/arm/boot/dts/msm8974-v2-iommu.dtsi
	arch/arm/mach-msm/Makefile
	arch/arm/mach-msm/Makefile.boot
	arch/arm/mach-msm/bam_dmux.c
	arch/arm/mach-msm/clock-8974.c
	arch/arm/mach-msm/clock-mdss-8974.c
	arch/arm/mach-msm/include/mach/board.h
	arch/arm/mach-msm/include/mach/gpiomux.h
	arch/arm/mach-msm/lpm_levels.c
	arch/arm/mach-msm/msm_qmi_interface.c
	arch/arm/mach-msm/qdsp6v2/msm_audio_ion.c
	drivers/base/bus.c
	drivers/cpufreq/cpufreq_ondemand.c
	drivers/gpu/msm/adreno.c
	drivers/gpu/msm/adreno.h
	drivers/gpu/msm/adreno_postmortem.c
	drivers/gpu/msm/adreno_ringbuffer.c
	drivers/gpu/msm/kgsl.c
	drivers/gpu/msm/kgsl.h
	drivers/gpu/msm/kgsl_device.h
	drivers/gpu/msm/kgsl_iommu.c
	drivers/gpu/msm/kgsl_sharedmem.c
	drivers/hwmon/qpnp-adc-current.c
	drivers/hwmon/qpnp-adc-voltage.c
	drivers/leds/leds-qpnp.c
	drivers/media/platform/msm/camera_v2/isp/msm_isp40.c
	drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c
	drivers/media/platform/msm/camera_v2/ispif/msm_ispif.c
	drivers/media/platform/msm/camera_v2/ispif/msm_ispif.h
	drivers/media/platform/msm/camera_v2/msm.c
	drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.c
	drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.h
	drivers/media/platform/msm/camera_v2/sensor/Makefile
	drivers/media/platform/msm/camera_v2/sensor/actuator/msm_actuator.h
	drivers/media/platform/msm/camera_v2/sensor/cci/msm_cci.c
	drivers/media/platform/msm/camera_v2/sensor/eeprom/msm_eeprom.c
	drivers/media/platform/msm/camera_v2/sensor/flash/msm_led_trigger.c
	drivers/media/platform/msm/camera_v2/sensor/msm_sensor.c
	drivers/media/platform/msm/vidc/msm_vdec.c
	drivers/media/platform/msm/vidc/msm_venc.c
	drivers/media/platform/msm/vidc/msm_vidc_common.c
	drivers/media/platform/msm/wfd/wfd-ioctl.c
	drivers/mmc/core/cd-gpio.c
	drivers/mmc/core/core.c
	drivers/mmc/host/msm_sdcc.c
	drivers/mmc/host/sdhci-msm.c
	drivers/platform/msm/qpnp-power-on.c
	drivers/platform/msm/qpnp-pwm.c
	drivers/power/qpnp-bms.c
	drivers/power/qpnp-charger.c
	drivers/tty/serial/msm_serial_hs.c
	drivers/usb/dwc3/core.c
	drivers/usb/dwc3/dwc3-msm.c
	drivers/usb/dwc3/dwc3_otg.c
	drivers/usb/dwc3/dwc3_otg.h
	drivers/usb/dwc3/gadget.c
	drivers/usb/gadget/f_mtp.c
	drivers/video/msm/mdss/mdp3_ctrl.c
	drivers/video/msm/mdss/mdss_dsi.c
	drivers/video/msm/mdss/mdss_fb.c
	drivers/video/msm/mdss/mdss_hdmi_edid.c
	drivers/video/msm/mdss/mdss_hdmi_tx.c
	drivers/video/msm/mdss/mdss_mdp.h
	drivers/video/msm/mdss/mdss_mdp_ctl.c
	drivers/video/msm/mdss/mdss_mdp_intf_cmd.c
	drivers/video/msm/mdss/mdss_mdp_intf_video.c
	drivers/video/msm/mdss/mdss_mdp_overlay.c
	drivers/video/msm/mdss/mdss_mdp_pipe.c
	drivers/video/msm/mdss/mdss_panel.h
	drivers/video/msm/mdss/msm_mdss_io_8974.c
	include/linux/mmc/sdhci.h
	include/linux/msm_mdp.h
	include/media/msm_cam_sensor.h
	include/media/msmb_pproc.h
	include/sound/q6adm-v2.h
	include/video/msm_hdmi_modes.h
	kernel/power/earlysuspend.c
	kernel/power/process.c
	net/core/flow.c
	sound/soc/codecs/wcd9306.c
	sound/soc/codecs/wcd9320.c
	sound/soc/codecs/wcd9xxx-mbhc.c
	sound/soc/codecs/wcd9xxx-mbhc.h
	sound/soc/msm/msm8974.c
	sound/soc/msm/qdsp6v2/audio_acdb.c
	sound/soc/msm/qdsp6v2/msm-dai-q6-v2.c
	sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c
	sound/soc/msm/qdsp6v2/q6adm.c
	sound/soc/msm/qdsp6v2/q6afe.c
	sound/soc/msm/qdsp6v2/q6asm.c
	sound/soc/msm/qdsp6v2/q6lsm.c
	sound/soc/msm/qdsp6v2/q6voice.c
	sound/soc/msm/qdsp6v2/q6voice.h