Failed merge - resolved

Signed-off-by: Randy DuCharme <radio.ad5gb@gmail.com>

Conflicts:
	arch/arm/configs/cyanogenmod_quincyatt_defconfig
	drivers/video/msm/mdp4_overlay_writeback.c