jf: MH1 (4.3) kernel merge

Conflicts:
	drivers/cpufreq/cpufreq_ondemand.c
	drivers/sensorhub/ssp_firmware.c
	drivers/video/msm/mdp4_util.c
	drivers/video/msm/mipi_samsung_octa_video_full_hd_pt.c
	firmware/ssp_rev03.fw.ihex

Conflicts:
	drivers/char/msm_rotator.c
	drivers/gpu/msm/adreno.c
	drivers/gpu/msm/adreno.h
	drivers/gpu/msm/adreno_a3xx.c
	drivers/gpu/msm/kgsl.c
	drivers/gpu/msm/kgsl_iommu.c
	drivers/gpu/msm/kgsl_pwrctrl.c
	drivers/gpu/msm/kgsl_pwrctrl.h
	drivers/gpu/msm/kgsl_sharedmem.c
	drivers/hwmon/epm_adc.c
	drivers/video/msm/mdp.h
	drivers/video/msm/mdp4.h
	drivers/video/msm/mdp4_overlay.c
	drivers/video/msm/mdp4_util.c
	drivers/video/msm/msm_fb.c
	drivers/video/msm/msm_fb.h
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_helper.c
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_properties.c
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_shared_mem.h
	drivers/video/msm/vidc/common/dec/vdec.c
	drivers/video/msm/vidc/common/enc/venc.c
	drivers/video/msm/vidc/common/vcd/vcd_sub.c
	include/linux/msm_mdp.h
	include/linux/msm_rotator.h
	include/linux/msm_vidc_enc.h
	include/media/msm/vcd_property.h
	include/video/msm_hdmi_modes.h

Change-Id: I9558558777a11cc8f6b633e397c809aa6993ceaf

Conflicts:
	Makefile
	drivers/gpu/msm/Kconfig
	drivers/hwmon/epm_adc.c