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

Conflicts:
	arch/arm/configs/msm8960-perf_defconfig
	arch/arm/configs/msm8960_defconfig
	arch/arm/mach-msm/Kconfig
	arch/arm/mach-msm/Makefile
	arch/arm/mach-msm/board-8930-gpiomux.c
	arch/arm/mach-msm/board-8930.c
	arch/arm/mach-msm/clock-8960.c
	arch/arm/mach-msm/socinfo.c
	arch/arm/tools/mach-types
	drivers/media/radio/radio-iris.c
	drivers/media/video/msm/msm_mctl_pp.c
	drivers/video/msm/mdp4_util.c
	sound/soc/codecs/wcd9304.c

'merge cm-10.1'