Some clean up from all the update merges

Conflicts:
	drivers/video/msm/mipi_samsung_octa_video_full_hd_pt.c