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

Conflicts:
	arch/arm/mach-msm/bam_dmux.c
	arch/arm/mach-msm/board-8930-regulator-pm8038.c
	arch/arm/mach-msm/board-8930-regulator-pm8917.c
	arch/arm/mach-msm/board-8930.c
	arch/arm/mach-msm/board-m2-display.c
	arch/arm/mach-msm/ipc_router.c
	arch/arm/mach-msm/ipc_socket.c
	arch/arm/mach-msm/mdm_common.c
	arch/arm/mach-msm/msm_rq_stats.c
	arch/arm/mach-msm/msm_watchdog.c
	arch/arm/mach-msm/socinfo.c
	block/blk-core.c
	drivers/cpufreq/cpufreq_stats.c
	drivers/input/touchscreen/synaptics_fw_update.c
	drivers/input/touchscreen/synaptics_i2c_rmi4.c
	drivers/input/touchscreen/synaptics_rmi_dev.c
	drivers/media/video/msm/sensors/ov8825_v4l2.c
	drivers/video/msm/mdp4_overlay.c
	drivers/video/msm/mipi_dsi_host.c
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_vidc.c
	include/linux/mmzone.h
	kernel/hrtimer.c
	kernel/pid.c
	kernel/sched/core.c
	kernel/sched/fair.c
	mm/page_alloc.c
	sound/soc/msm/msm8930.c

'Merge'