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

Conflicts:
	Documentation/workqueue.txt
	arch/arm/configs/msm8960-perf_defconfig
	arch/arm/configs/msm8960_defconfig
	arch/arm/kernel/signal.c
	arch/arm/mach-msm/Kconfig
	arch/arm/mach-msm/board-8064-pmic.c
	arch/arm/mach-msm/board-8064.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-gpiomux.c
	arch/arm/mach-msm/board-8960-pmic.c
	arch/arm/mach-msm/board-m2-display.c
	arch/arm/mach-msm/board-msm8x60-camera.c
	arch/arm/mach-msm/cache_erp.c
	arch/arm/mach-msm/cpufreq.c
	arch/arm/mach-msm/cpuidle.c
	arch/arm/mach-msm/include/mach/board.h
	arch/arm/mach-msm/ipc_router_smd_xprt.c
	arch/arm/mach-msm/ipc_socket.c
	arch/arm/mach-msm/mdm2.c
	arch/arm/mach-msm/mdm_common.c
	arch/arm/mach-msm/msm_bus/msm_bus_arb.c
	arch/arm/mach-msm/pm-8x60.c
	arch/arm/mach-msm/qdsp6v2/audio_utils_aio.c
	arch/arm/mach-msm/rpm-smd.c
	arch/arm/mach-msm/rpm_resources.c
	arch/arm/mach-msm/wcnss-ssr-8960.c
	block/blk-core.c
	drivers/char/diag/diag_dci.c
	drivers/char/diag/diag_debugfs.c
	drivers/char/diag/diag_masks.c
	drivers/char/diag/diagchar.h
	drivers/char/diag/diagchar_core.c
	drivers/char/diag/diagfwd.c
	drivers/char/diag/diagfwd_cntl.c
	drivers/char/diag/diagfwd_cntl.h
	drivers/char/diag/diagmem.c
	drivers/char/msm_rotator.c
	drivers/gpu/ion/ion_iommu_heap.c
	drivers/gpu/msm/adreno.c
	drivers/gpu/msm/adreno.h
	drivers/gpu/msm/adreno_a3xx.c
	drivers/gpu/msm/kgsl.c
	drivers/gpu/msm/kgsl_events.c
	drivers/gpu/msm/kgsl_iommu.c
	drivers/gpu/msm/kgsl_sharedmem.c
	drivers/input/touchscreen/atmel_mxt_ts.c
	drivers/leds/leds-pm8xxx.c
	drivers/media/dvb/dvb-core/dmxdev.c
	drivers/media/dvb/mpq/demux/mpq_dmx_plugin_common.c
	drivers/media/dvb/mpq/demux/mpq_dmx_plugin_tspp_v1.c
	drivers/media/video/msm/gemini/msm_gemini_core.c
	drivers/media/video/msm/gemini/msm_gemini_hw.c
	drivers/media/video/msm/gemini/msm_gemini_hw.h
	drivers/media/video/msm/gemini/msm_gemini_sync.c
	drivers/media/video/msm/gemini/msm_gemini_sync.h
	drivers/media/video/msm/io/msm_camera_io_util.c
	drivers/media/video/msm/jpeg_10/msm_jpeg_hw.c
	drivers/media/video/msm/jpeg_10/msm_jpeg_hw.h
	drivers/media/video/msm/mercury/msm_mercury_hw.c
	drivers/media/video/msm/mercury/msm_mercury_hw.h
	drivers/media/video/msm/msm.c
	drivers/media/video/msm/msm_gesture.c
	drivers/media/video/msm/msm_mctl.c
	drivers/media/video/msm/sensors/msm_sensor.c
	drivers/media/video/msm/sensors/ov8825_v4l2.c
	drivers/media/video/msm/sensors/ov9724_v4l2.c
	drivers/media/video/msm/server/msm_cam_server.c
	drivers/media/video/msm/vfe/msm_vfe32.c
	drivers/media/video/msm/vfe/msm_vfe32.h
	drivers/media/video/msm/vfe/msm_vfe_stats_buf.c
	drivers/mfd/pm8xxx-pwm.c
	drivers/misc/tspp.c
	drivers/mmc/host/msm_sdcc.c
	drivers/net/ethernet/msm/msm_rmnet_smux.c
	drivers/net/wireless/Kconfig
	drivers/net/wireless/wcnss/Makefile
	drivers/net/wireless/wcnss/wcnss_riva.c
	drivers/net/wireless/wcnss/wcnss_wlan.c
	drivers/power/pm8921-bms.c
	drivers/spi/spi_qsd.c
	drivers/staging/android/binder.c
	drivers/tty/n_smux.c
	drivers/tty/smux_ctl.c
	drivers/tty/smux_private.h
	drivers/tty/smux_test.c
	drivers/usb/gadget/ci13xxx_udc.c
	drivers/usb/gadget/ci13xxx_udc.h
	drivers/usb/gadget/u_data_hsic.c
	drivers/usb/gadget/u_ether.c
	drivers/usb/host/ehci-msm-hsic.c
	drivers/usb/otg/msm_otg.c
	drivers/video/msm/external_common.c
	drivers/video/msm/hdmi_msm.c
	drivers/video/msm/mdp.c
	drivers/video/msm/mdp4_overlay_dsi_cmd.c
	drivers/video/msm/mdp4_util.c
	drivers/video/msm/mdp_vsync.c
	drivers/video/msm/mipi_dsi.c
	drivers/video/msm/mipi_dsi.h
	drivers/video/msm/mipi_dsi_host.c
	drivers/video/msm/msm_dss_io_8960.c
	drivers/video/msm/msm_fb.c
	drivers/video/msm/msm_fb_panel.h
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_interrupt_handler.c
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_metadata.c
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_properties.c
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_shared_mem.c
	drivers/video/msm/vidc/1080p/ddl/vidc.c
	drivers/video/msm/vidc/1080p/ddl/vidc.h
	drivers/video/msm/vidc/1080p/ddl/vidc_hwio_reg.h
	drivers/video/msm/vidc/1080p/resource_tracker/vcd_res_tracker.c
	drivers/video/msm/vidc/common/dec/vdec.c
	drivers/video/msm/vidc/common/enc/venc.c
	drivers/video/msm/vidc/common/enc/venc_internal.c
	drivers/video/msm/vidc/common/enc/venc_internal.h
	drivers/video/msm/vidc/common/init/vidc_init.c
	drivers/video/msm/vidc/common/vcd/vcd.h
	drivers/video/msm/vidc/common/vcd/vcd_client_sm.c
	drivers/video/msm/vidc/common/vcd/vcd_power_sm.c
	drivers/video/msm/vidc/common/vcd/vcd_scheduler.c
	drivers/video/msm/vidc/common/vcd/vcd_sub.c
	fs/cifs/transport.c
	fs/eventpoll.c
	fs/nfs/inode.c
	fs/nfs/nfs3proc.c
	fs/nfs/nfs4proc.c
	fs/select.c
	include/linux/capability.h
	include/linux/debug_locks.h
	include/linux/diagchar.h
	include/linux/eventpoll.h
	include/linux/freezer.h
	include/linux/leds-pm8xxx.h
	include/linux/mfd/pm8xxx/pm8921-bms.h
	include/linux/mfd/pm8xxx/pwm.h
	include/linux/mfd/wcd9xxx/wcd9304_registers.h
	include/linux/msm_rotator.h
	include/linux/msm_vidc_dec.h
	include/linux/msm_vidc_enc.h
	include/linux/wcnss_wlan.h
	include/media/msm/vcd_property.h
	include/net/bluetooth/l2cap.h
	include/sound/pcm.h
	include/trace/events/workqueue.h
	kernel/exit.c
	kernel/freezer.c
	kernel/futex.c
	kernel/hrtimer.c
	kernel/lockdep.c
	kernel/power/process.c
	kernel/sched/fair.c
	kernel/signal.c
	kernel/timer.c
	kernel/workqueue.c
	net/bluetooth/l2cap_core.c
	net/bluetooth/smp.c
	net/sunrpc/sched.c
	net/unix/af_unix.c
	sound/core/pcm.c
	sound/core/pcm_lib.c
	sound/soc/codecs/wcd9304-tables.c
	sound/soc/codecs/wcd9304.c
	sound/soc/codecs/wcd9310.c
	sound/soc/msm/msm-compr-q6.c
	sound/soc/msm/msm-lowlatency-pcm-q6.c
	sound/soc/msm/msm-multi-ch-pcm-q6.c
	sound/soc/msm/msm-pcm-loopback.c
	sound/soc/msm/msm-pcm-lpa.c
	sound/soc/msm/msm-pcm-q6.c
	sound/soc/msm/msm-pcm-routing.c
	sound/soc/msm/msm8960-d2.c
	sound/soc/msm/qdsp6/q6afe.c
	sound/soc/msm/qdsp6/q6asm.c
	sound/soc/msm/qdsp6/q6voice.c
	sound/soc/msm/qdsp6v2/msm-compr-q6-v2.c
	sound/soc/msm/qdsp6v2/msm-pcm-lpa-v2.c
	sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c

'Merge'