Merge branch 'upstream' into cm-10.1

Conflicts:

	arch/arm/configs/msm8960-perf_defconfig
	arch/arm/configs/msm8960_defconfig