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

Conflicts:
	arch/arm/Kconfig.debug
	arch/arm/common/gic.c
	arch/arm/include/asm/hardware/gic.h
	arch/arm/include/asm/system_info.h
	arch/arm/kernel/irq.c
	arch/arm/kernel/setup.c
	arch/arm/kernel/smp.c
	arch/arm/kernel/traps.c
	arch/arm/mach-msm/Makefile
	arch/arm/mach-msm/board-8930-camera.c
	arch/arm/mach-msm/clock-8960.c
	arch/arm/mach-msm/include/mach/restart.h
	arch/arm/mach-msm/include/mach/sec_debug.h
	arch/arm/mach-msm/modem_notifier.c
	arch/arm/mach-msm/modem_notifier.h
	arch/arm/mach-msm/msm_watchdog.c
	arch/arm/mach-msm/platsmp-8625.c
	arch/arm/mach-msm/pm-8x60.c
	arch/arm/mach-msm/restart.c
	arch/arm/mach-msm/subsystem_restart.c
	arch/arm/mm/mmu.c
	block/blk-core.c
	block/row-iosched.c
	drivers/media/video/msm/msm_mctl_pp.c
	drivers/media/video/msm_zsl/msm.c
	drivers/mmc/host/msm_sdcc.c
	drivers/staging/android/logger.c
	drivers/staging/android/lowmemorykiller.c
	drivers/video/msm/msm_fb.c
	include/linux/diagchar.h
	kernel/hrtimer.c
	kernel/irq/handle.c
	kernel/irq/irqdesc.c
	kernel/panic.c
	kernel/printk.c
	kernel/sched/core.c
	kernel/softirq.c
	sound/soc/msm/msm8960-d2.c

'Merge Update'