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/configs/msm8960-perf_defconfig
	arch/arm/configs/msm8960_defconfig
	arch/arm/mach-msm/board-8064-display.c
	arch/arm/mach-msm/board-8064-pmic.c
	arch/arm/mach-msm/board-8064.c
	arch/arm/mach-msm/board-8930-camera.c
	arch/arm/mach-msm/board-8930-display.c
	arch/arm/mach-msm/board-8930-pmic.c
	arch/arm/mach-msm/board-8930.c
	arch/arm/mach-msm/board-8960-display.c
	arch/arm/mach-msm/board-8960-pmic.c
	arch/arm/mach-msm/board-8960.c
	arch/arm/mach-msm/board-msm8x60.c
	arch/arm/mach-msm/clock-8960.c
	arch/arm/mach-msm/devices-8064.c
	arch/arm/mach-msm/devices-8930.c
	arch/arm/mach-msm/devices-8960.c
	arch/arm/mach-msm/devices-iommu.c
	arch/arm/mach-msm/include/mach/board.h
	arch/arm/mach-msm/include/mach/kgsl.h
	arch/arm/mach-msm/include/mach/msm_serial_hs.h
	arch/arm/mach-msm/timer.c
	drivers/char/diag/diag_dci.c
	drivers/char/diag/diag_dci.h
	drivers/char/diag/diag_masks.c
	drivers/char/diag/diagchar.h
	drivers/char/diag/diagchar_core.c
	drivers/char/diag/diagchar_hdlc.c
	drivers/char/diag/diagchar_hdlc.h
	drivers/char/diag/diagfwd.c
	drivers/char/diag/diagfwd.h
	drivers/char/diag/diagfwd_bridge.c
	drivers/char/diag/diagfwd_cntl.c
	drivers/char/diag/diagfwd_cntl.h
	drivers/char/diag/diagfwd_hsic.c
	drivers/char/diag/diagfwd_hsic.h
	drivers/char/diag/diagfwd_sdio.c
	drivers/char/diag/diagfwd_sdio.h
	drivers/char/diag/diagfwd_smux.c
	drivers/char/diag/diagfwd_smux.h
	drivers/gpu/ion/ion_iommu_heap.c
	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.c
	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/flash.c
	drivers/media/video/msm/msm.c
	drivers/media/video/msm/msm_mctl_buf.c
	drivers/media/video/msm/msm_mctl_pp.c
	drivers/media/video/msm/sensors/msm_sensor.c
	drivers/media/video/msm/vfe/msm_vfe32.c
	drivers/misc/tspp.c
	drivers/mmc/core/sdio.c
	drivers/mmc/host/msm_sdcc.c
	drivers/mmc/host/msm_sdcc.h
	drivers/power/pm8921-bms.c
	drivers/power/pm8921-charger.c
	drivers/power/pm8xxx-ccadc.c
	drivers/thermal/msm8960_tsens.c
	drivers/tty/serial/msm_serial_hs.c
	drivers/usb/gadget/u_ether.c
	drivers/usb/misc/diag_bridge.c
	drivers/video/msm/mdp.c
	drivers/video/msm/mdp4.h
	drivers/video/msm/mdp4_overlay.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/mipi_dsi.c
	include/drm/kgsl_drm.h
	include/linux/diagchar.h
	include/linux/mfd/pm8xxx/ccadc.h
	include/linux/mfd/pm8xxx/pm8921-bms.h
	include/linux/msm_kgsl.h
	sound/soc/msm/msm8960.c

'Merge'