Merge "msm: camera: RDI2 frame divert"
Merge "msm: camera: RDI2 frame divert"
Conflicts:
	arch/arm/mach-msm/board-8960.c
	drivers/char/diag/diag_debugfs.c
	drivers/char/diag/diag_masks.c
	drivers/char/diag/diagchar_core.c
	drivers/media/video/msm_wfd/mdp-4-subdev.c
	drivers/video/msm/mdp.c
Merge "msm_fb: display: update var in display commit"
Conflicts:
	drivers/char/diag/diag_debugfs.c
	drivers/char/diag/diag_masks.c
	drivers/char/diag/diagchar_core.c