Merge branch 'cm-10.2' of https://github.com/CyanogenMod/android_kernel_samsung_d2 into jellybean3

Conflicts:
	drivers/video/msm/mdp.c
	drivers/video/msm/msm_fb.c
	drivers/video/msm/msm_fb.h

'Merge'