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

Conflicts:
	arch/Kconfig
	arch/arm/Kconfig
	arch/arm/kernel/hw_breakpoint.c
	arch/arm/mach-msm/Kconfig
	arch/arm/mach-msm/board-m2-camera.c
	arch/arm/mach-msm/board-m2_att.c
	arch/arm/mach-msm/board-m2_spr.c
	arch/arm/mach-msm/board-m2_vzw.c
	arch/arm/mach-msm/cpufreq.c
	arch/arm/mach-msm/devices-8960.c
	arch/arm/mach-msm/footswitch-8x60.c
	arch/arm/mach-msm/pm-8x60.c
	arch/arm/mm/proc-v7.S

'merge with cm-10.1'