Merge "msm: spm-v2: Add support for AVS"
Conflicts:
	arch/arm/mach-msm/board-8960.c
	arch/arm/mach-msm/spm-v2.c
Merge "msm: spm-v2: Add support for AVS"
Conflicts:
	arch/arm/configs/msm8960_defconfig
	arch/arm/mach-msm/acpuclock-8064.c
	arch/arm/mach-msm/acpuclock-8930ab.c
	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/cpufreq/cpufreq_ondemand.c
	drivers/gpu/msm/adreno_ringbuffer.c
	drivers/media/video/msm_wfd/mdp-4-subdev.c
	drivers/media/video/msm_wfd/mdp-subdev.c
	drivers/staging/android/lowmemorykiller.c
	drivers/usb/otg/msm_otg.c
	drivers/video/msm/mdp.c
	drivers/video/msm/msm_fb.c
	drivers/video/msm/msm_fb.h
	include/linux/msm_mdp.h
	sound/soc/msm/msm-pcm-q6.c