Merge "mmc: msm_sdcc: Reset SDCC controller if check for Tx/Rx active fails"
Conflicts:
	arch/arm/mach-msm/acpuclock-8930ab.c
	arch/arm/mach-msm/lge/mako/board-mako.c
	drivers/gpu/msm/adreno_ringbuffer.c
	drivers/media/video/msm_wfd/mdp-4-subdev.c
Merge "msm_fb: display: Add alpha enable check in blend"
Conflicts:
	arch/arm/mach-msm/board-8960.c
	drivers/media/video/msm_wfd/mdp-4-subdev.c
Merge "ASoC: WCD9304: Fix deadlock in mutex while HS insert"
Conflicts:
	arch/arm/mach-msm/board-8960.c
	drivers/media/video/msm_wfd/mdp-4-subdev.c