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

Conflicts:
	arch/arm/mach-msm/board-8930-camera.c
	arch/arm/mach-msm/board-m2-pmic.c
	arch/arm/mach-msm/clock-8960.c
	drivers/media/video/msm/msm_mctl_pp.c
	drivers/media/video/msm/sensors/ov8825_v4l2.c
	include/linux/diagchar.h

'merge'