Roll back for compatibility
Merge branch 'cm-10.2' of https://github.com/Haus1/android_kernel_htc_msm8960 into cm-10.2

Conflicts:
	drivers/video/msm/msm_fb.c