Merge "msm: spm-v2: Disable AVS operations on unsupported targets"
Conflicts:
	arch/arm/mach-msm/acpuclock-8930ab.c
	arch/arm/mach-msm/board-8960.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
	drivers/video/msm/msm_fb.c
Merge "msm: spm: enable avs for 8960 hw"
Conflicts:
	arch/arm/mach-msm/acpuclock-8930ab.c
	arch/arm/mach-msm/board-8960.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 "defconfig: Enable MSM_AVS_HW on 8960 targets"
Conflicts:
	arch/arm/mach-msm/acpuclock-8930ab.c
	arch/arm/mach-msm/board-8960.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