Merge branch 'cm-10.2' of https://github.com/CyanogenMod/android_kernel_samsung_d2 into jellybean3

Conflicts:
	arch/arm/configs/cyanogen_d2_defconfig
	arch/arm/mach-msm/board-m2_att.c
	arch/arm/mach-msm/board-m2_spr.c
	arch/arm/mach-msm/board-m2_vzw.c
	drivers/cpufreq/cpufreq_interactive.c
	drivers/devfreq/governor_performance.c
	drivers/devfreq/governor_powersave.c
	drivers/i2c/busses/i2c-qup.c
	drivers/input/input-mt.c
	drivers/input/touchscreen/mms_ts_144.c
	net/netfilter/nf_conntrack_sip.c

'Merge