derp
Merge branch 'cm-11.0' of https://github.com/TroNit/android_kernel_htc_msm8960 into cm-11.0