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

Conflicts:
	arch/arm/configs/cyanogen_d2-r530_defconfig
	arch/arm/configs/cyanogen_d2att_defconfig
	arch/arm/configs/cyanogen_d2spr_defconfig
	arch/arm/configs/cyanogen_d2vzw_defconfig
	arch/arm/mach-msm/Kconfig
	arch/arm/mach-msm/devices-8960.c

'Merge'