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