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

Conflicts:
	Documentation/devicetree/bindings/gpu/adreno.txt
	arch/arm/boot/dts/msm8974-gpu.dtsi
	arch/arm/mach-msm/board-8930-camera.c
	arch/arm/mach-msm/board-8930.c
	arch/arm/mach-msm/clock-8960.c
	arch/arm/mach-msm/devices-iommu.c
	arch/arm/mach-msm/include/mach/kgsl.h
	drivers/gpu/msm/Makefile
	drivers/gpu/msm/adreno.c
	drivers/gpu/msm/adreno.h
	drivers/gpu/msm/adreno_a2xx.c
	drivers/gpu/msm/adreno_a2xx_snapshot.c
	drivers/gpu/msm/adreno_a3xx.c
	drivers/gpu/msm/adreno_ringbuffer.c
	drivers/gpu/msm/adreno_snapshot.c
	drivers/gpu/msm/kgsl.c
	drivers/gpu/msm/kgsl.h
	drivers/gpu/msm/kgsl_debugfs.c
	drivers/gpu/msm/kgsl_device.h
	drivers/gpu/msm/kgsl_drm.c
	drivers/gpu/msm/kgsl_iommu.c
	drivers/gpu/msm/kgsl_iommu.h
	drivers/gpu/msm/kgsl_mmu.c
	drivers/gpu/msm/kgsl_mmu.h
	drivers/gpu/msm/kgsl_pwrctrl.c
	drivers/gpu/msm/kgsl_pwrctrl.h
	drivers/gpu/msm/kgsl_pwrscale_trustzone.c
	drivers/gpu/msm/kgsl_sharedmem.c
	drivers/gpu/msm/kgsl_sharedmem.h
	drivers/gpu/msm/kgsl_snapshot.c
	drivers/gpu/msm/kgsl_sync.c
	drivers/gpu/msm/kgsl_trace.h
	drivers/gpu/msm/z180.c
	drivers/media/video/msm/msm_mctl.c
	drivers/media/video/msm/msm_mctl_pp.c
	drivers/media/video/msm/server/msm_cam_server.c
	drivers/net/ethernet/msm/msm_rmnet_smux.c
	drivers/video/msm/external_common.c
	drivers/video/msm/external_common.h
	drivers/video/msm/hdmi_msm.c
	drivers/video/msm/hdmi_msm.h
	drivers/video/msm/mdp4.h
	drivers/video/msm/mdp4_overlay.c
	drivers/video/msm/mdp4_overlay_dsi_cmd.c
	drivers/video/msm/mdp4_overlay_dsi_video.c
	drivers/video/msm/mdp4_overlay_dtv.c
	drivers/video/msm/mdp4_overlay_lcdc.c
	drivers/video/msm/msm_dss_io_8960.c
	drivers/video/msm/msm_fb.c
	include/drm/kgsl_drm.h
	include/linux/diagchar.h
	include/linux/msm_kgsl.h
	include/video/Kbuild

'merge cm-10.1'