Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_kernel_samsung_d2 into jellybean2

Conflicts:
	drivers/video/msm/msm_fb.c