Merge remote-tracking branch 'upstream/cm-11.0' into test

Conflicts:
	drivers/video/msm/mdss/mdss_dsi_panel.c

Change-Id: I3bb00715893807226093395ba57749294a0037b0