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

Conflicts:
	Documentation/devicetree/bindings/input/touchscreen/synaptics_i2c_rmi4.txt
	arch/arm/configs/cyanogen_d2-r530_defconfig
	arch/arm/configs/cyanogen_d2att_defconfig
	arch/arm/configs/cyanogen_d2cri_defconfig
	arch/arm/configs/cyanogen_d2spr_defconfig
	arch/arm/configs/cyanogen_d2vzw_defconfig
	arch/arm/configs/msm8960-perf_defconfig
	arch/arm/configs/msm8960_defconfig
	arch/arm/mach-msm/bam_dmux.c
	arch/arm/mach-msm/board-8930-gpiomux.c
	arch/arm/mach-msm/board-8930-regulator-pm8038.c
	arch/arm/mach-msm/board-8930.c
	arch/arm/mach-msm/board-8930.h
	arch/arm/mach-msm/clock-8960.c
	arch/arm/mach-msm/devices-8960.c
	arch/arm/mach-msm/devices.h
	arch/arm/mach-msm/ipc_socket.c
	arch/arm/mach-msm/mdm_common.c
	arch/arm/mach-msm/spm_devices.c
	arch/arm/mach-msm/subsystem_restart.c
	drivers/gpu/ion/ion_iommu_heap.c
	drivers/input/touchscreen/mms_ts_144.c
	drivers/input/touchscreen/synaptics_fw_update.c
	drivers/input/touchscreen/synaptics_i2c_rmi4.c
	drivers/input/touchscreen/synaptics_i2c_rmi4.h
	drivers/input/touchscreen/synaptics_rmi_dev.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_tspp_v1.c
	drivers/media/video/msm/server/msm_cam_server.c
	drivers/media/video/msm_wfd/enc-mfc-subdev.c
	drivers/mmc/card/block.c
	drivers/mmc/core/core.c
	drivers/power/pm8921-charger.c
	drivers/spi/spi_qsd.c
	drivers/staging/ste_rmi4/Kconfig
	drivers/staging/ste_rmi4/Makefile
	drivers/tty/serial/msm_serial_hs.c
	drivers/video/msm/mdp4_overlay_lcdc.c
	drivers/video/msm/mdp_debugfs.c
	drivers/video/msm/msm_fb.c
	drivers/video/msm/smart_mtp_s6e8aa0x01.c
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_helper.c
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_properties.c
	drivers/video/msm/vidc/1080p/resource_tracker/vcd_res_tracker.c
	drivers/video/msm/vidc/1080p/resource_tracker/vcd_res_tracker.h
	drivers/video/msm/vidc/common/dec/vdec.c
	drivers/video/msm/vidc/common/enc/venc_internal.c
	include/linux/input/synaptics_dsx.h
	include/linux/mmc/host.h
	include/media/msm_camera.h
	include/sound/apr_audio.h
	include/sound/q6asm.h
	net/bluetooth/smp.c
	sound/soc/msm/Makefile
	sound/soc/msm/msm-dai-fe.c
	sound/soc/msm/msm-pcm-q6.c
	sound/soc/msm/msm-pcm-routing.c
	sound/soc/msm/msm-pcm-routing.h
	sound/soc/msm/msm8930.c
	sound/soc/msm/qdsp6/q6asm.c

'Merge'