Merge branch 'cm-10.1' of https://github.com/CyanogenMod/android_kernel_htc_msm8960 into cm-10.1-linaro
Merge branch 'cm-10.1-linaro' of https://github.com/UltimatumKang/android_kernel_htc_msm8960-3.4 into cm-10.1-linaro

Conflicts:
	arch/arm/vfp/vfpmodule.c