Merge "defconfig: Enable MSM_AVS_HW on 8960 targets"
Merge "defconfig: Enable MSM_AVS_HW on 8960 targets"
Conflicts:
	arch/arm/configs/msm8960_defconfig
	arch/arm/mach-msm/acpuclock-8960ab.c
	arch/arm/mach-msm/board-8064.c
	arch/arm/mach-msm/board-8960.c
	arch/arm/mach-msm/lge/mako/board-mako.c
	arch/arm/mach-msm/pm-8x60.c
	drivers/media/video/msm_wfd/mdp-4-subdev.c
	drivers/usb/otg/msm_otg.c
	drivers/video/msm/msm_fb.c
	drivers/video/msm/msm_fb.h
	sound/soc/msm/msm-pcm-q6.c