Merge branch 'cm-10.2' of https://github.com/CyanogenMod/android_kernel_samsung_d2 into jellybean3

Conflicts:
	Makefile
	arch/alpha/Makefile
	arch/arm/Kconfig
	arch/arm/configs/msm8960-perf_defconfig
	arch/arm/configs/msm8960_defconfig
	arch/arm/configs/msm8974_defconfig
	arch/arm/kernel/perf_event.c
	arch/arm/mach-msm/Kconfig
	arch/arm/mach-msm/Makefile
	arch/arm/mach-msm/board-8064-pmic.c
	arch/arm/mach-msm/board-8930-gpiomux.c
	arch/arm/mach-msm/board-8930.c
	arch/arm/mach-msm/board-8960.c
	arch/arm/mach-msm/hsic_sysmon.c
	arch/arm/mach-msm/include/mach/scm.h
	arch/arm/mach-msm/include/mach/smem_log.h
	arch/arm/mach-msm/ipc_router.c
	arch/arm/mach-msm/ipc_router.h
	arch/arm/mach-msm/ipc_router_smd_xprt.c
	arch/arm/mach-msm/ipc_socket.c
	arch/arm/mach-msm/msm_ipc_router_security.c
	arch/arm/mach-msm/scm.c
	arch/arm/mach-msm/smem_log.c
	arch/cris/arch-v10/lib/Makefile
	arch/cris/include/asm/posix_types.h
	arch/cris/kernel/vmlinux.lds.S
	arch/frv/include/asm/thread_info.h
	arch/frv/kernel/process.c
	arch/m68k/emu/natfeat.c
	arch/m68k/include/asm/div64.h
	arch/microblaze/configs/mmu_defconfig
	arch/microblaze/configs/nommu_defconfig
	arch/mips/Kconfig
	arch/mips/include/asm/io.h
	arch/mips/include/asm/page.h
	arch/powerpc/mm/numa.c
	arch/sparc/lib/Makefile
	arch/x86/kernel/i387.c
	arch/x86/xen/setup.c
	arch/xtensa/kernel/Makefile
	arch/xtensa/kernel/vmlinux.lds.S
	arch/xtensa/mm/init.c
	drivers/acpi/battery.c
	drivers/ata/libata-pmp.c
	drivers/battery/sec_battery.c
	drivers/char/virtio_console.c
	drivers/gpu/drm/i915/i915_drv.h
	drivers/gpu/drm/i915/i915_reg.h
	drivers/gpu/drm/i915/intel_display.c
	drivers/gpu/drm/i915/intel_lvds.c
	drivers/gpu/drm/i915/intel_ringbuffer.c
	drivers/gpu/ion/ion_cma_heap.c
	drivers/gpu/msm/adreno.c
	drivers/gpu/msm/adreno.h
	drivers/gpu/msm/adreno_debugfs.c
	drivers/gpu/msm/adreno_ringbuffer.c
	drivers/gpu/msm/kgsl.c
	drivers/gpu/msm/kgsl.h
	drivers/gpu/msm/kgsl_debugfs.c
	drivers/gpu/msm/kgsl_device.h
	drivers/gpu/msm/kgsl_iommu.c
	drivers/gpu/msm/kgsl_mmu.c
	drivers/gpu/msm/kgsl_pwrctrl.c
	drivers/gpu/msm/kgsl_sharedmem.c
	drivers/gpu/msm/kgsl_sync.c
	drivers/gpu/msm/z180.c
	drivers/hid/hid-microsoft.c
	drivers/hwmon/adt7470.c
	drivers/input/touchscreen/atmel_mxt_ts.c
	drivers/input/touchscreen/synaptics_fw_update.c
	drivers/input/touchscreen/synaptics_i2c_rmi4.c
	drivers/md/raid1.c
	drivers/md/raid10.c
	drivers/media/video/msm/gemini/msm_gemini_platform.c
	drivers/media/video/msm/gemini/msm_gemini_sync.c
	drivers/media/video/msm/msm_mctl.c
	drivers/media/video/msm/msm_v4l2_video.c
	drivers/mmc/card/block.c
	drivers/mmc/core/core.c
	drivers/mmc/core/mmc.c
	drivers/mmc/core/mmc_ops.c
	drivers/mmc/core/sd.c
	drivers/mmc/host/msm_sdcc.c
	drivers/net/arcnet/arcnet.c
	drivers/net/can/usb/peak_usb/pcan_usb.c
	drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.c
	drivers/net/ethernet/realtek/8139cp.c
	drivers/net/usb/rmnet_usb_data.c
	drivers/net/usb/smsc75xx.c
	drivers/net/wireless/ath/ath9k/htc_drv_init.c
	drivers/net/wireless/hostap/hostap_ioctl.c
	drivers/net/wireless/iwlegacy/4965-mac.c
	drivers/net/wireless/iwlegacy/common.c
	drivers/net/wireless/mwifiex/sdio.c
	drivers/net/wireless/rt2x00/rt2x00queue.c
	drivers/net/wireless/wcnss/wcnss_wlan.c
	drivers/net/wireless/zd1201.c
	drivers/of/fdt.c
	drivers/power/pm8921-charger.c
	drivers/s390/scsi/zfcp_erp.c
	drivers/s390/scsi/zfcp_qdio.c
	drivers/scsi/megaraid/megaraid_sas_base.c
	drivers/scsi/nsp32.c
	drivers/scsi/scsi.c
	drivers/slimbus/slim-msm-ctrl.c
	drivers/spi/spi_qsd.c
	drivers/staging/prima/CORE/DXE/src/wlan_qct_dxe.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_ftm.h
	drivers/staging/prima/CORE/HDD/inc/wlan_hdd_hostapd.h
	drivers/staging/prima/CORE/HDD/inc/wlan_hdd_main.h
	drivers/staging/prima/CORE/HDD/inc/wlan_hdd_p2p.h
	drivers/staging/prima/CORE/HDD/inc/wlan_hdd_tx_rx.h
	drivers/staging/prima/CORE/HDD/inc/wlan_hdd_wext.h
	drivers/staging/prima/CORE/HDD/inc/wlan_hdd_wmm.h
	drivers/staging/prima/CORE/HDD/inc/wlan_hdd_wowl.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_tdls.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/HDD/src/wlan_hdd_wmm.c
	drivers/staging/prima/CORE/HDD/src/wlan_hdd_wowl.c
	drivers/staging/prima/CORE/MAC/inc/qwlan_version.h
	drivers/staging/prima/CORE/MAC/inc/sirApi.h
	drivers/staging/prima/CORE/MAC/inc/wniApi.h
	drivers/staging/prima/CORE/MAC/inc/wniCfgAp.h
	drivers/staging/prima/CORE/MAC/inc/wniCfgSta.h
	drivers/staging/prima/CORE/MAC/src/cfg/cfgParamName.c
	drivers/staging/prima/CORE/MAC/src/cfg/cfgUtil/cfg.txt
	drivers/staging/prima/CORE/MAC/src/include/sirParams.h
	drivers/staging/prima/CORE/MAC/src/pe/include/limFT.h
	drivers/staging/prima/CORE/MAC/src/pe/include/limSession.h
	drivers/staging/prima/CORE/MAC/src/pe/lim/limAssocUtils.c
	drivers/staging/prima/CORE/MAC/src/pe/lim/limFT.c
	drivers/staging/prima/CORE/MAC/src/pe/lim/limIbssPeerMgmt.c
	drivers/staging/prima/CORE/MAC/src/pe/lim/limLinkMonitoringAlgo.c
	drivers/staging/prima/CORE/MAC/src/pe/lim/limProcessAssocReqFrame.c
	drivers/staging/prima/CORE/MAC/src/pe/lim/limProcessMessageQueue.c
	drivers/staging/prima/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c
	drivers/staging/prima/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.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/lim/limPropExtsUtils.c
	drivers/staging/prima/CORE/MAC/src/pe/lim/limRoamingAlgo.c
	drivers/staging/prima/CORE/MAC/src/pe/lim/limUtils.c
	drivers/staging/prima/CORE/MAC/src/pe/pmm/pmmApi.c
	drivers/staging/prima/CORE/MAC/src/pe/sch/schBeaconProcess.c
	drivers/staging/prima/CORE/SAP/inc/sapApi.h
	drivers/staging/prima/CORE/SAP/src/sapChSelect.c
	drivers/staging/prima/CORE/SME/inc/csrApi.h
	drivers/staging/prima/CORE/SME/inc/csrInternal.h
	drivers/staging/prima/CORE/SME/inc/csrNeighborRoam.h
	drivers/staging/prima/CORE/SME/inc/smeInside.h
	drivers/staging/prima/CORE/SME/inc/smeInternal.h
	drivers/staging/prima/CORE/SME/inc/sme_Api.h
	drivers/staging/prima/CORE/SME/inc/sme_QosApi.h
	drivers/staging/prima/CORE/SME/src/QoS/sme_Qos.c
	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/pmcApi.c
	drivers/staging/prima/CORE/SME/src/sme_common/sme_Api.c
	drivers/staging/prima/CORE/SYS/legacy/src/utils/src/dot11f.c
	drivers/staging/prima/CORE/SYS/legacy/src/utils/src/macTrace.c
	drivers/staging/prima/CORE/SYS/legacy/src/utils/src/parserApi.c
	drivers/staging/prima/CORE/TL/inc/wlan_qct_tl.h
	drivers/staging/prima/CORE/TL/src/wlan_qct_tl.c
	drivers/staging/prima/CORE/TL/src/wlan_qct_tli.h
	drivers/staging/prima/CORE/VOSS/inc/i_vos_trace.h
	drivers/staging/prima/CORE/VOSS/inc/vos_api.h
	drivers/staging/prima/CORE/VOSS/inc/vos_diag_core_log.h
	drivers/staging/prima/CORE/VOSS/inc/vos_getBin.h
	drivers/staging/prima/CORE/VOSS/inc/vos_nvitem.h
	drivers/staging/prima/CORE/VOSS/inc/wlan_hdd_misc.h
	drivers/staging/prima/CORE/VOSS/src/vos_api.c
	drivers/staging/prima/CORE/VOSS/src/vos_getBin.c
	drivers/staging/prima/CORE/VOSS/src/vos_nvitem.c
	drivers/staging/prima/CORE/VOSS/src/vos_sched.c
	drivers/staging/prima/CORE/VOSS/src/vos_timer.c
	drivers/staging/prima/CORE/VOSS/src/vos_trace.c
	drivers/staging/prima/CORE/WDA/inc/wlan_qct_wda.h
	drivers/staging/prima/CORE/WDA/src/wlan_qct_wda.c
	drivers/staging/prima/CORE/WDI/CP/inc/wlan_qct_wdi.h
	drivers/staging/prima/CORE/WDI/CP/inc/wlan_qct_wdi_i.h
	drivers/staging/prima/CORE/WDI/CP/src/wlan_qct_wdi.c
	drivers/staging/prima/CORE/WDI/CP/src/wlan_qct_wdi_dp.c
	drivers/staging/prima/CORE/WDI/DP/inc/wlan_qct_wdi_ds_i.h
	drivers/staging/prima/CORE/WDI/TRP/DTS/src/wlan_qct_wdi_dts.c
	drivers/staging/prima/CORE/WDI/WPAL/inc/wlan_qct_os_trace.h
	drivers/staging/prima/CORE/WDI/WPAL/inc/wlan_qct_pal_api.h
	drivers/staging/prima/CORE/WDI/WPAL/inc/wlan_qct_pal_packet.h
	drivers/staging/prima/CORE/WDI/WPAL/inc/wlan_qct_pal_trace.h
	drivers/staging/prima/CORE/WDI/WPAL/src/wlan_qct_pal_api.c
	drivers/staging/prima/CORE/WDI/WPAL/src/wlan_qct_pal_packet.c
	drivers/staging/prima/Makefile
	drivers/staging/prima/firmware_bin/WCNSS_cfg.dat
	drivers/staging/prima/firmware_bin/WCNSS_qcom_cfg.ini
	drivers/staging/prima/riva/inc/wlan_hal_cfg.h
	drivers/staging/prima/riva/inc/wlan_hal_msg.h
	drivers/tty/serial/mxs-auart.c
	drivers/usb/core/hub.c
	drivers/usb/core/quirks.c
	drivers/usb/gadget/u_rmnet_ctrl_smd.c
	drivers/usb/host/ehci-hub.c
	drivers/usb/host/ehci-msm-hsic.c
	drivers/usb/misc/Kconfig
	drivers/usb/misc/Makefile
	drivers/usb/misc/diag_bridge.c
	drivers/usb/misc/ks_bridge.c
	drivers/usb/misc/mdm_data_bridge.c
	drivers/usb/serial/csvt.c
	drivers/usb/serial/mos7720.c
	drivers/video/msm/external_common.c
	drivers/video/msm/external_common.h
	drivers/video/msm/hdmi_msm.c
	drivers/video/msm/hdmi_msm.h
	drivers/video/msm/mdp4_overlay.c
	drivers/video/msm/mdp4_overlay_dtv.c
	drivers/video/msm/mdp4_overlay_writeback.c
	drivers/xen/events.c
	fs/aio.c
	fs/cifs/cifsencrypt.c
	fs/cifs/cifsglob.h
	fs/cifs/connect.c
	fs/cifs/sess.c
	fs/dcache.c
	fs/debugfs/inode.c
	fs/ext4/ext4_jbd2.c
	fs/ext4/ialloc.c
	fs/ext4/super.c
	fs/nilfs2/segbuf.c
	fs/notify/fanotify/fanotify_user.c
	fs/proc/proc_sysctl.c
	fs/proc/task_mmu.c
	fs/seq_file.c
	include/linux/ftrace_event.h
	include/linux/hugetlb.h
	include/linux/mfd/pm8xxx/pm8921-charger.h
	include/linux/mmc/core.h
	include/linux/wait.h
	include/trace/events/workqueue.h
	init/main.c
	kernel/events/core.c
	kernel/futex.c
	kernel/sched/fair.c
	kernel/trace/trace.c
	kernel/workqueue.c
	lib/Kconfig
	lib/Makefile
	mm/filemap.c
	mm/hugetlb.c
	mm/nommu.c
	net/ipv4/sysctl_net_ipv4.c
	net/ipv6/ip6mr.c
	net/key/af_key.c
	net/mac80211/rx.c
	net/sched/sch_atm.c
	net/sched/sch_cbq.c
	net/sctp/outqueue.c
	net/wireless/db.txt
	net/wireless/nl80211.c
	sound/core/compress_offload.c
	sound/core/pcm_native.c
	sound/oss/Kconfig
	sound/soc/codecs/wcd9310.c
	sound/soc/msm/msm-pcm-afe.c
	tools/perf/util/map.c

'Merge'