Merge several drivers with upstream kernel for cm-11.0 compatibility

Conflicts:
	drivers/video/msm/mdss/mdss_fb.c
	include/linux/videodev2.h

Change-Id: I46f40d40e8b69979a66ad14ad50208e71a2cfced