MH1 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