Merge branch 'Franco/staging'

Conflicts:
	Documentation/devicetree/bindings/fb/mdss-mdp.txt
	drivers/video/msm/mdss/mdss_fb.c
	drivers/video/msm/mdss/mdss_fb.h
	drivers/video/msm/mdss/mdss_mdp_overlay.c