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

Conflicts:
	Documentation/devicetree/bindings/arm/msm/msm_thermal.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/board-8064-gpiomux.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-gpiomux.c
	arch/arm/mach-msm/board-8930-pmic.c
	arch/arm/mach-msm/board-8930-regulator-pm8038.c
	arch/arm/mach-msm/board-8930-storage.c
	arch/arm/mach-msm/board-8930.c
	arch/arm/mach-msm/board-8930.h
	arch/arm/mach-msm/board-8960.c
	arch/arm/mach-msm/clock-8960.c
	arch/arm/mach-msm/devices-8064.c
	arch/arm/mach-msm/devices.h
	arch/arm/mach-msm/include/mach/dma.h
	arch/arm/mach-msm/mdm_common.c
	arch/arm/mach-msm/msm_rq_stats.c
	arch/arm/mach-msm/pm-8x60.c
	arch/arm/mach-msm/pm-data.c
	arch/arm/mach-msm/timer.c
	arch/arm/mm/dma-mapping.c
	block/blk-core.c
	drivers/cpufreq/cpufreq_interactive.c
	drivers/gpu/ion/ion_cp_heap.c
	drivers/input/touchscreen/Kconfig
	drivers/input/touchscreen/Makefile
	drivers/input/touchscreen/cyttsp-i2c-qc.c
	drivers/media/video/msm/Kconfig
	drivers/media/video/msm/msm.c
	drivers/media/video/msm/msm_mctl.c
	drivers/media/video/msm/msm_mctl_pp.c
	drivers/media/video/msm/sensors/Makefile
	drivers/media/video/msm/sensors/ov8825_v4l2.c
	drivers/platform/msm/sps/sps.c
	drivers/power/Kconfig
	drivers/power/Makefile
	drivers/power/pm8921-bms.c
	drivers/power/pm8921-charger.c
	drivers/slimbus/slim-msm-ctrl.c
	drivers/slimbus/slimbus.c
	drivers/staging/zcache/Kconfig
	drivers/staging/zram/Kconfig
	drivers/staging/zsmalloc/Kconfig
	drivers/staging/zsmalloc/zsmalloc-main.c
	drivers/staging/zsmalloc/zsmalloc_int.h
	drivers/thermal/msm_thermal.c
	drivers/usb/gadget/ci13xxx_udc.c
	drivers/usb/gadget/u_data_hsic.c
	drivers/usb/host/ehci-msm-hsic.c
	drivers/usb/misc/mdm_ctrl_bridge.c
	drivers/usb/misc/mdm_data_bridge.c
	drivers/usb/serial/usb_wwan.c
	drivers/video/msm/Kconfig
	drivers/video/msm/Makefile
	drivers/video/msm/hdmi_msm.c
	drivers/video/msm/mdp.c
	drivers/video/msm/mdp.h
	drivers/video/msm/mdp4.h
	drivers/video/msm/mdp4_overlay.c
	drivers/video/msm/mdp4_overlay_dsi_cmd.c
	drivers/video/msm/mdp4_video_enhance.c
	drivers/video/msm/mipi_dsi.h
	drivers/video/msm/mipi_dsi_host.c
	drivers/video/msm/mipi_samsung_oled_video_hd_pt.c
	drivers/video/msm/msm_fb.c
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_interrupt_handler.c
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_utils.h
	drivers/video/msm/vidc/common/init/vidc_init.c
	include/linux/mfd/pm8xxx/pm8921-bms.h
	include/linux/msm_thermal.h
	include/linux/nl80211.h
	include/net/cfg80211.h
	net/wireless/nl80211.c
	sound/soc/codecs/wcd9304.c
	sound/soc/codecs/wcd9304.h
	sound/soc/msm/msm8930.c

'merge into cm-10.1'