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

Conflicts:
	AndroidKernel.mk
	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/configs/m2selinux_defconfig
	drivers/usb/gadget/f_mass_storage.c
	drivers/usb/gadget/storage_common.c
	include/linux/diagchar.h
	scripts/kconfig/Makefile
	scripts/kconfig/conf.c
	scripts/kconfig/confdata.c
	scripts/kconfig/lkc_proto.h

'Merge'