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

Conflicts:
	drivers/cpufreq/cpufreq.c
	include/linux/diagchar.h

'Merge'