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

Conflicts:
	arch/arm/mach-msm/clock-8960.c
	drivers/media/video/msm/msm_mctl_pp.c
	drivers/video/msm/logo.c
	drivers/video/msm/mdp4_overlay.c
	drivers/video/msm/mdp4_overlay_dsi_video.c
	drivers/video/msm/mipi_dsi.c

'merge update'