MFA Merge:

Conflicts:
	drivers/video/msm/mdp4_overlay.c