jf: MFx merge

Conflicts:
	arch/arm/mach-msm/msm_bus/msm_bus_board_8064.c
	drivers/video/msm/mdp.c
	drivers/video/msm/mdp.h
	drivers/video/msm/mdp4_overlay.c
	drivers/video/msm/mdp4_overlay_dsi_cmd.c
	drivers/video/msm/mdp4_overlay_dsi_video.c
	drivers/video/msm/mdp4_overlay_dtv.c
	drivers/video/msm/mdp4_overlay_lcdc.c

Change-Id: I81fb72095d66511c0d4221b830f72f8b6b85ea47

Conflicts:
	drivers/battery/max77693_charger.c
	drivers/video/msm/mdnie_lite_tuning.h
	kernel/signal.c