Merge "Add full_msm8960-perf_defconfig"
Merge "Add full_msm8960-perf_defconfig"
Conflicts:
	arch/arm/mach-msm/board-8960.c
	arch/arm/mach-msm/spm-v2.c