Merge branch 'cm-11.0' of CyanogenMod/android_kernel_htc_msm8960 into cm-11.0