Conflicts:
	drivers/staging/android/binder.c
	drivers/video/msm/mdp4.h
	drivers/video/msm/mdp4_overlay.c