Merge "msm: spm: enable avs for 8960 hw"
Conflicts:
	arch/arm/mach-msm/board-8960.c