fixup! Merge branch 'cm-10.1' of https://github.com/CyanogenMod/android_kernel_htc_msm8960 into cm-10.1-dev
fixup! Merge tag 'v3.4.50' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into cm-10.1-dev