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

Conflicts:
	arch/arm/mach-msm/Kconfig
	arch/arm/mach-msm/Makefile
	arch/arm/mach-msm/board-8064-pmic.c
	arch/arm/mach-msm/board-8064.c
	arch/arm/mach-msm/board-8960-gpiomux.c
	arch/arm/mach-msm/board-m2_att.c
	arch/arm/mach-msm/board-m2_spr.c
	arch/arm/mach-msm/board-m2_vzw.c
	arch/arm/mach-msm/clock-8960.c
	arch/arm/mach-msm/devices-8960.c
	arch/arm/mach-msm/devices.h
	arch/arm/mach-msm/include/mach/mdm2.h
	arch/arm/mach-msm/include/mach/msm_ipc_logging.h
	arch/arm/mach-msm/ipc_router.c
	arch/arm/mach-msm/ipc_router.h
	arch/arm/mach-msm/ipc_socket.c
	arch/arm/mach-msm/mdm_common.c
	arch/arm/mach-msm/subsystem_restart.c
	drivers/char/msm_rotator.c
	drivers/gpio/gpio-msm-common.c
	drivers/gpu/ion/ion_iommu_heap.c
	drivers/gpu/ion/ion_system_heap.c
	drivers/media/dvb/dvb-core/dvb_demux.c
	drivers/media/dvb/mpq/demux/mpq_dmx_plugin_common.c
	drivers/media/video/msm/csi/msm_ispif.c
	drivers/media/video/msm/csi/msm_ispif.h
	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/server/msm_cam_server.c
	drivers/media/video/msm/vfe/msm_vfe32.c
	drivers/media/video/msm/vfe/msm_vfe_stats_buf.c
	drivers/misc/tspp.c
	drivers/net/usb/rmnet_usb_ctrl.c
	drivers/usb/gadget/u_smd.c
	drivers/video/msm/lvds.c
	drivers/video/msm/mdp4_overlay.c
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_errors.c
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_interrupt_handler.c
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_vidc.c
	drivers/video/msm/vidc/1080p/ddl/vidc.h
	drivers/video/msm/vidc/1080p/ddl/vidc_pix_cache.c
	drivers/video/msm/vidc/common/vcd/vcd_scheduler.c
	drivers/video/msm/vidc/common/vcd/vcd_sub.c
	include/linux/msm_ipc.h
	include/linux/msm_mdp.h
	include/linux/nl80211.h
	include/linux/nmi.h
	include/net/cfg80211.h
	kernel/watchdog.c
	lib/Kconfig.debug
	net/wireless/nl80211.c
	net/wireless/util.c
	sound/soc/codecs/wcd9304.c
	sound/soc/codecs/wcd9310.c
	sound/soc/soc-pcm.c

'merge'