Merge "defconfig: turn on SCHED_MC for some MSM targets"
Merge "defconfig: turn on SCHED_MC for some MSM targets"
Conflicts:
	arch/arm/mach-msm/board-8960.c
	arch/arm/mach-msm/spm-v2.c