Merge branch 'glitch' of https://github.com/xboxfanj/kernel_msm into glitch