Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_kernel_samsung_d2 into kitkat

Conflicts:
	Documentation/input/event-codes.txt
	Documentation/input/multi-touch-protocol.txt
	Makefile
	arch/arm/Makefile
	arch/arm/configs/cyanogen_apexq_defconfig
	arch/arm/configs/cyanogen_d2_defconfig
	arch/arm/configs/m2selinux_defconfig
	arch/arm/configs/msm8960_defconfig
	arch/arm/kernel/perf_event.c
	arch/arm/kernel/sched_clock.c
	arch/arm/kernel/signal.c
	arch/arm/mach-msm/Makefile
	arch/arm/mach-msm/acpuclock.c
	arch/arm/mach-msm/board-8064-pmic.c
	arch/arm/mach-msm/board-8064-regulator.c
	arch/arm/mach-msm/include/mach/qdsp6v2/audio_dev_ctl.h
	arch/arm/mach-msm/krait-regulator.c
	arch/arm/mach-msm/pm-8x60.c
	arch/arm/mach-msm/qdsp6v2/aac_in.c
	arch/arm/mach-msm/qdsp6v2/audio_acdb.c
	arch/arm/mach-msm/qdsp6v2/audio_utils.c
	arch/arm/mach-msm/subsystem_restart.c
	arch/cris/include/asm/io.h
	arch/ia64/include/asm/processor.h
	arch/parisc/kernel/head.S
	arch/parisc/kernel/traps.c
	arch/powerpc/kernel/signal_32.c
	arch/powerpc/kernel/vio.c
	arch/powerpc/kvm/book3s_hv_rmhandlers.S
	arch/powerpc/platforms/powernv/pci-ioda.c
	arch/um/kernel/exitcode.c
	arch/x86/kernel/microcode_amd.c
	arch/xtensa/kernel/signal.c
	block/blk-core.c
	block/blk-settings.c
	block/blk-timeout.c
	crypto/ansi_cprng.c
	drivers/acpi/acpica/exoparg1.c
	drivers/acpi/acpica/exstore.c
	drivers/ata/libata-eh.c
	drivers/base/genlock.c
	drivers/base/sync.c
	drivers/block/brd.c
	drivers/block/loop.c
	drivers/char/Kconfig
	drivers/char/msm_rotator.c
	drivers/char/random.c
	drivers/connector/cn_proc.c
	drivers/connector/connector.c
	drivers/cpufreq/cpufreq_ondemand.c
	drivers/crypto/msm/qce.c
	drivers/crypto/msm/qce.h
	drivers/crypto/msm/qcedev.c
	drivers/crypto/msm/qcrypto.c
	drivers/gpu/drm/drm_drv.c
	drivers/gpu/drm/radeon/atombios_encoders.c
	drivers/gpu/drm/radeon/evergreen.c
	drivers/gpu/msm/adreno.c
	drivers/gpu/msm/adreno.h
	drivers/gpu/msm/adreno_ringbuffer.c
	drivers/gpu/msm/kgsl.c
	drivers/gpu/msm/kgsl_iommu.c
	drivers/gpu/msm/kgsl_pwrctrl.c
	drivers/gpu/msm/kgsl_pwrctrl.h
	drivers/hwmon/lm90.c
	drivers/input/evdev.c
	drivers/input/input.c
	drivers/input/touchscreen/cyttsp-i2c-qc.c
	drivers/iommu/iommu.c
	drivers/iommu/msm_iommu.c
	drivers/iommu/msm_iommu_dev.c
	drivers/md/dm-snap-persistent.c
	drivers/md/raid1.c
	drivers/md/raid10.c
	drivers/media/radio/radio-iris.c
	drivers/media/radio/radio-tavarua.c
	drivers/media/video/msm/actuators/msm_actuator.c
	drivers/media/video/msm/cpp/msm_cpp.c
	drivers/media/video/msm/msm.c
	drivers/media/video/msm/msm_gesture.c
	drivers/misc/qseecom.c
	drivers/misc/tspp.c
	drivers/net/can/c_can/c_can.c
	drivers/net/can/dev.c
	drivers/net/can/flexcan.c
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
	drivers/net/ethernet/marvell/mv643xx_eth.c
	drivers/net/ethernet/realtek/8139cp.c
	drivers/net/ethernet/ti/davinci_emac.c
	drivers/net/usb/rmnet_usb_data.c
	drivers/net/wan/farsync.c
	drivers/net/wan/wanxl.c
	drivers/net/wireless/ath/regd.c
	drivers/net/wireless/libertas/debugfs.c
	drivers/net/wireless/rt2x00/rt2800usb.c
	drivers/net/wireless/rt2x00/rt2x00mac.c
	drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
	drivers/net/xen-netback/common.h
	drivers/net/xen-netback/interface.c
	drivers/net/xen-netback/netback.c
	drivers/pci/pci-driver.c
	drivers/pci/setup-res.c
	drivers/remoteproc/remoteproc_core.c
	drivers/scsi/aacraid/commctrl.c
	drivers/scsi/aacraid/linit.c
	drivers/staging/bcm/Bcmchar.c
	drivers/staging/ozwpan/ozcdev.c
	drivers/staging/prima/CORE/HDD/inc/qc_sap_ioctl.h
	drivers/staging/prima/CORE/HDD/inc/wlan_hdd_cfg.h
	drivers/staging/prima/CORE/HDD/inc/wlan_hdd_cfg80211.h
	drivers/staging/prima/CORE/HDD/inc/wlan_hdd_main.h
	drivers/staging/prima/CORE/HDD/inc/wlan_hdd_softap_tx_rx.h
	drivers/staging/prima/CORE/HDD/inc/wlan_hdd_tx_rx.h
	drivers/staging/prima/CORE/HDD/src/wlan_hdd_assoc.c
	drivers/staging/prima/CORE/HDD/src/wlan_hdd_cfg.c
	drivers/staging/prima/CORE/HDD/src/wlan_hdd_cfg80211.c
	drivers/staging/prima/CORE/HDD/src/wlan_hdd_early_suspend.c
	drivers/staging/prima/CORE/HDD/src/wlan_hdd_ftm.c
	drivers/staging/prima/CORE/HDD/src/wlan_hdd_hostapd.c
	drivers/staging/prima/CORE/HDD/src/wlan_hdd_main.c
	drivers/staging/prima/CORE/HDD/src/wlan_hdd_p2p.c
	drivers/staging/prima/CORE/HDD/src/wlan_hdd_softap_tx_rx.c
	drivers/staging/prima/CORE/HDD/src/wlan_hdd_tx_rx.c
	drivers/staging/prima/CORE/HDD/src/wlan_hdd_wext.c
	drivers/staging/prima/CORE/MAC/inc/qwlan_version.h
	drivers/staging/prima/CORE/MAC/src/include/cfgGlobal.h
	drivers/staging/prima/CORE/MAC/src/include/utilsApi.h
	drivers/staging/prima/CORE/MAC/src/pe/include/rrmGlobal.h
	drivers/staging/prima/CORE/MAC/src/pe/lim/limProcessAssocReqFrame.c
	drivers/staging/prima/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c
	drivers/staging/prima/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
	drivers/staging/prima/CORE/MAC/src/pe/lim/limProcessTdls.c
	drivers/staging/prima/CORE/MAC/src/pe/pmm/pmmApi.c
	drivers/staging/prima/CORE/MAC/src/pe/pmm/pmmDebug.c
	drivers/staging/prima/CORE/MAC/src/pe/rrm/rrmApi.c
	drivers/staging/prima/CORE/MAC/src/pe/sch/schBeaconGen.c
	drivers/staging/prima/CORE/MAC/src/pe/sch/schBeaconProcess.c
	drivers/staging/prima/CORE/MAC/src/pe/sch/schDebug.c
	drivers/staging/prima/CORE/SME/inc/csrApi.h
	drivers/staging/prima/CORE/SME/inc/csrInternal.h
	drivers/staging/prima/CORE/SME/inc/sme_Api.h
	drivers/staging/prima/CORE/SME/inc/smsDebug.h
	drivers/staging/prima/CORE/SME/src/csr/csrApiRoam.c
	drivers/staging/prima/CORE/SME/src/csr/csrApiScan.c
	drivers/staging/prima/CORE/SME/src/csr/csrNeighborRoam.c
	drivers/staging/prima/CORE/SME/src/pmc/pmc.c
	drivers/staging/prima/CORE/SME/src/pmc/pmcApi.c
	drivers/staging/prima/CORE/SME/src/pmc/pmcLogDump.c
	drivers/staging/prima/CORE/SME/src/rrm/sme_rrm.c
	drivers/staging/prima/CORE/SME/src/sme_common/sme_Api.c
	drivers/staging/prima/CORE/SYS/legacy/src/utils/src/logApi.c
	drivers/staging/prima/CORE/VOSS/inc/vos_types.h
	drivers/staging/prima/CORE/VOSS/src/vos_api.c
	drivers/staging/prima/CORE/VOSS/src/vos_nvitem.c
	drivers/staging/prima/CORE/VOSS/src/vos_power.c
	drivers/staging/prima/CORE/VOSS/src/vos_trace.c
	drivers/staging/prima/CORE/WDA/src/wlan_qct_wda.c
	drivers/staging/prima/CORE/WDI/CP/src/wlan_qct_wdi_dp.c
	drivers/staging/prima/Kbuild
	drivers/tty/serial/msm_serial_hs.c
	drivers/uio/uio.c
	drivers/usb/core/hub.c
	drivers/usb/core/quirks.c
	drivers/usb/gadget/u_bam.c
	drivers/usb/gadget/u_ctrl_hsic.c
	drivers/usb/host/ehci-msm-hsic.c
	drivers/usb/otg/msm_otg.c
	drivers/usb/serial/ftdi_sio.c
	drivers/usb/serial/ftdi_sio_ids.h
	drivers/usb/serial/mos7840.c
	drivers/usb/serial/option.c
	drivers/usb/serial/ti_usb_3410_5052.c
	drivers/video/au1100fb.c
	drivers/video/au1200fb.c
	drivers/video/msm/Kconfig
	drivers/video/msm/external_common.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_writeback.c
	drivers/video/msm/mdp_ppp.c
	drivers/video/msm/mdss/mdss_fb.c
	drivers/video/msm/mdss/mdss_mdp_util.c
	drivers/video/msm/mhl/mhl_8334.c
	drivers/video/msm/msm_fb.c
	drivers/video/msm/msm_fb_def.h
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_properties.c
	drivers/watchdog/ts72xx_wdt.c
	fs/configfs/dir.c
	fs/dcache.c
	fs/exec.c
	fs/ext3/dir.c
	fs/ext3/ext3.h
	fs/ext3/hash.c
	fs/ext4/xattr.c
	fs/jfs/jfs_inode.c
	fs/nfs/inode.c
	fs/nfs/nfs3proc.c
	fs/nfs/nfs4filelayout.c
	fs/nfs/nfs4proc.c
	fs/nfs/nfs4state.c
	fs/nfs/proc.c
	fs/nfsd/vfs.c
	fs/proc/inode.c
	fs/statfs.c
	include/linux/Kbuild
	include/linux/binfmts.h
	include/linux/cpu.h
	include/linux/fs.h
	include/linux/input.h
	include/linux/iommu.h
	include/linux/random.h
	include/linux/sched.h
	include/linux/skbuff.h
	include/linux/tspp.h
	include/net/cfg80211.h
	include/net/cipso_ipv4.h
	include/net/dst.h
	include/net/secure_seq.h
	init/main.c
	kernel/cpu.c
	kernel/ptrace.c
	kernel/time/clockevents.c
	kernel/time/timekeeping.c
	kernel/trace/trace.c
	kernel/trace/trace_event_perf.c
	lib/scatterlist.c
	mm/mmap.c
	mm/page-writeback.c
	mm/slub.c
	mm/swap.c
	net/8021q/vlan_netlink.c
	net/bridge/br_stp_if.c
	net/compat.c
	net/core/flow_dissector.c
	net/core/secure_seq.c
	net/ipv4/af_inet.c
	net/ipv4/inet_hashtables.c
	net/ipv4/ip_output.c
	net/ipv4/route.c
	net/ipv4/tcp_input.c
	net/ipv4/tcp_output.c
	net/ipv6/inet6_hashtables.c
	net/ipv6/ip6_output.c
	net/ipv6/route.c
	net/l2tp/l2tp_ppp.c
	net/mac80211/ieee80211_i.h
	net/mac80211/scan.c
	net/mac80211/status.c
	net/netfilter/xt_qtaguid.c
	net/sctp/output.c
	net/socket.c
	net/sunrpc/clnt.c
	net/sunrpc/xprtsock.c
	net/unix/af_unix.c
	net/unix/diag.c
	net/wireless/radiotap.c
	net/wireless/reg.c
	net/wireless/reg.h
	security/integrity/ima/ima_policy.c
	sound/core/pcm_lib.c
	sound/isa/msnd/msnd_pinnacle.c
	sound/pci/hda/patch_hdmi.c
	sound/pci/hda/patch_realtek.c
	sound/soc/codecs/wcd9304.c
	sound/soc/codecs/wm_hubs.c
	sound/soc/msm/msm-pcm-lpa.c
	sound/soc/msm/msm-pcm-voip.c
	sound/soc/msm/qdsp6/q6voice.c
	sound/soc/msm/qdsp6v2/msm-pcm-voip-v2.c
	sound/soc/msm/qdsp6v2/q6voice.c
	sound/soc/soc-dapm.c
	sound/usb/6fire/chip.c
	sound/usb/usx2y/usbusx2yaudio.c
	sound/usb/usx2y/usx2yhwdeppcm.c

'Merge.