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

Conflicts:
	arch/arm/mach-msm/board-8930-camera.c
	arch/arm/mach-msm/clock-8960.c
	arch/arm/mach-msm/msm_bus/msm_bus_core.h
	drivers/gpu/msm/adreno.c
	drivers/gpu/msm/adreno.h
	drivers/gpu/msm/adreno_drawctxt.h
	drivers/gpu/msm/adreno_postmortem.c
	drivers/gpu/msm/adreno_ringbuffer.c
	drivers/gpu/msm/kgsl_iommu.c
	drivers/gpu/msm/kgsl_mmu.c
	drivers/gpu/msm/kgsl_sharedmem.c
	drivers/media/dvb/mpq/demux/mpq_dmx_plugin_common.c
	drivers/media/dvb/mpq/demux/mpq_dmx_plugin_common.h
	drivers/media/dvb/mpq/demux/mpq_dmx_plugin_tsif.c
	drivers/media/dvb/mpq/demux/mpq_dmx_plugin_tspp_v1.c
	drivers/media/dvb/mpq/demux/mpq_sdmx.c
	drivers/media/dvb/mpq/demux/mpq_sdmx.h
	drivers/media/video/msm/msm_mctl_pp.c
	include/linux/diagchar.h
	include/linux/msm_kgsl.h

'merge update'