Cm 10.2 msm recent

Recent commits in the msm8960 kernel that looked reasonable for ours.