mergeup: merge msm8960 kernel