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

Conflicts:
	Makefile
	arch/arm/configs/cyanogen_apexq_defconfig
	arch/arm/configs/msm8960-perf_defconfig
	arch/arm/configs/msm8960_defconfig
	arch/arm/kernel/head.S
	arch/arm/mach-msm/board-8064.c
	arch/arm/mach-msm/ipc_router.c
	arch/arm/mach-msm/ipc_router.h
	arch/arm/mach-msm/ipc_socket.c
	arch/arm/mach-versatile/pci.c
	arch/arm/mm/init.c
	arch/ia64/mm/contig.c
	arch/ia64/mm/discontig.c
	arch/mips/ath79/clock.c
	arch/parisc/mm/init.c
	arch/powerpc/kernel/align.c
	arch/powerpc/kernel/iommu.c
	arch/powerpc/kernel/vio.c
	arch/powerpc/lib/checksum_64.S
	arch/sparc/kernel/entry.S
	arch/sparc/kernel/ktlb.S
	arch/sparc/kernel/syscalls.S
	arch/sparc/kernel/trampoline_64.S
	arch/sparc/lib/ksyms.c
	arch/tile/include/asm/percpu.h
	arch/unicore32/mm/init.c
	arch/x86/kernel/reboot.c
	arch/x86/platform/efi/efi.c
	crypto/api.c
	drivers/acpi/acpi_ipmi.c
	drivers/base/sync.c
	drivers/block/cciss.c
	drivers/block/cpqarray.c
	drivers/bluetooth/ath3k.c
	drivers/bluetooth/btusb.c
	drivers/char/diag/diagchar.h
	drivers/char/diag/diagfwd.c
	drivers/char/diag/diagfwd_cntl.c
	drivers/char/msm_rotator.c
	drivers/dma/imx-dma.c
	drivers/gpu/drm/drm_edid.c
	drivers/gpu/drm/i915/intel_dp.c
	drivers/gpu/drm/radeon/atombios_dp.c
	drivers/gpu/drm/radeon/atombios_encoders.c
	drivers/gpu/drm/radeon/atombios_i2c.c
	drivers/gpu/drm/radeon/evergreen.c
	drivers/gpu/drm/radeon/evergreend.h
	drivers/gpu/drm/radeon/radeon_atombios.c
	drivers/gpu/drm/radeon/radeon_device.c
	drivers/gpu/drm/radeon/rs400.c
	drivers/gpu/drm/radeon/si.c
	drivers/gpu/drm/radeon/sid.h
	drivers/gpu/drm/ttm/ttm_tt.c
	drivers/gpu/msm/a3xx_reg.h
	drivers/gpu/msm/adreno.c
	drivers/gpu/msm/adreno.h
	drivers/gpu/msm/adreno_a3xx.c
	drivers/gpu/msm/adreno_pm4types.h
	drivers/gpu/msm/adreno_ringbuffer.c
	drivers/gpu/msm/kgsl.c
	drivers/gpu/msm/kgsl_debugfs.h
	drivers/gpu/msm/kgsl_device.h
	drivers/gpu/msm/kgsl_iommu.c
	drivers/gpu/msm/kgsl_pwrctrl.c
	drivers/gpu/msm/kgsl_snapshot.c
	drivers/gpu/msm/kgsl_sync.c
	drivers/hid/hid-core.c
	drivers/hid/hid-ids.h
	drivers/hid/hid-input.c
	drivers/hid/hid-lg2ff.c
	drivers/hid/hid-lg3ff.c
	drivers/hid/hid-lg4ff.c
	drivers/hid/hid-lgff.c
	drivers/hid/hid-logitech-dj.c
	drivers/hid/hid-ntrig.c
	drivers/hid/hid-pl.c
	drivers/hid/hid-speedlink.c
	drivers/hid/hid-zpff.c
	drivers/hid/usbhid/hid-quirks.c
	drivers/hwmon/applesmc.c
	drivers/hwmon/pm8xxx-adc-scale.c
	drivers/infiniband/ulp/srpt/ib_srpt.c
	drivers/iommu/intel-iommu.c
	drivers/md/dm-snap-persistent.c
	drivers/md/dm-snap.c
	drivers/media/video/msm/actuators/msm_actuator.c
	drivers/media/video/msm/csi/msm_csid.c
	drivers/media/video/msm/msm_camera.c
	drivers/media/video/msm/server/msm_cam_server.c
	drivers/media/video/msm/vfe/msm_vfe32.c
	drivers/media/video/msm_wfd/wfd-ioctl.c
	drivers/mmc/host/tmio_mmc_dma.c
	drivers/net/bonding/bond_main.c
	drivers/net/ethernet/freescale/gianfar.c
	drivers/net/ethernet/freescale/gianfar.h
	drivers/net/ethernet/sfc/rx.c
	drivers/net/ethernet/via/via-rhine.c
	drivers/net/ethernet/xilinx/ll_temac_main.c
	drivers/net/ppp/pptp.c
	drivers/net/usb/cdc_ether.c
	drivers/net/usb/dm9601.c
	drivers/net/usb/rmnet_usb_data.c
	drivers/net/wireless/ath/ath9k/ar9003_phy.c
	drivers/net/wireless/ath/ath9k/ath9k.h
	drivers/net/wireless/ath/ath9k/recv.c
	drivers/net/wireless/ath/ath9k/xmit.c
	drivers/net/wireless/bcmdhd/Makefile
	drivers/net/wireless/bcmdhd/bcmwifi_channels.h
	drivers/net/wireless/bcmdhd/dhd.h
	drivers/net/wireless/bcmdhd/dhd_cfg80211.c
	drivers/net/wireless/bcmdhd/dhd_common.c
	drivers/net/wireless/bcmdhd/dhd_custom_sec.c
	drivers/net/wireless/bcmdhd/dhd_linux.c
	drivers/net/wireless/bcmdhd/dhd_sdio.c
	drivers/net/wireless/bcmdhd/include/bcmsdh_sdmmc.h
	drivers/net/wireless/bcmdhd/include/epivers.h
	drivers/net/wireless/bcmdhd/include/linux_osl.h
	drivers/net/wireless/bcmdhd/include/linuxver.h
	drivers/net/wireless/bcmdhd/include/wlioctl.h
	drivers/net/wireless/bcmdhd/linux_osl.c
	drivers/net/wireless/bcmdhd/wl_android.c
	drivers/net/wireless/bcmdhd/wl_cfg80211.c
	drivers/net/wireless/bcmdhd/wl_cfgp2p.c
	drivers/net/wireless/bcmdhd/wl_roam.c
	drivers/net/wireless/brcm80211/brcmsmac/dma.c
	drivers/net/wireless/p54/p54usb.c
	drivers/net/wireless/rt2x00/rt2800lib.c
	drivers/net/wireless/rtlwifi/wifi.h
	drivers/of/base.c
	drivers/scsi/esp_scsi.c
	drivers/scsi/esp_scsi.h
	drivers/scsi/sd.c
	drivers/staging/comedi/drivers/dt282x.c
	drivers/staging/comedi/drivers/ni_65xx.c
	drivers/staging/vt6656/main_usb.c
	drivers/usb/class/cdc-wdm.c
	drivers/usb/core/config.c
	drivers/usb/core/devio.c
	drivers/usb/host/ehci-mxc.c
	drivers/usb/host/xhci-hub.c
	drivers/usb/host/xhci-plat.c
	drivers/usb/host/xhci-ring.c
	drivers/usb/host/xhci.c
	drivers/usb/host/xhci.h
	drivers/usb/serial/mos7720.c
	drivers/usb/serial/option.c
	drivers/video/msm/external_common.c
	drivers/video/msm/external_common.h
	drivers/video/msm/mdp4_overlay.c
	drivers/video/msm/mdp4_overlay_dsi_video.c
	drivers/video/msm/mipi_samsung_oled.c
	drivers/video/msm/msm_fb.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/init/vidc_init.c
	drivers/xen/grant-table.c
	fs/btrfs/relocation.c
	fs/cifs/connect.c
	fs/ext4/namei.c
	fs/fuse/dir.c
	fs/fuse/file.c
	fs/isofs/inode.c
	fs/notify/fanotify/fanotify.c
	fs/ocfs2/extent_map.c
	include/linux/hid.h
	include/linux/mm.h
	include/linux/msm_mdp.h
	include/linux/perf_event.h
	include/linux/rculist.h
	include/media/msm/vidc_init.h
	include/media/msm_camera.h
	include/media/v4l2-ctrls.h
	include/net/bluetooth/hci_core.h
	include/net/bluetooth/l2cap.h
	include/net/bluetooth/mgmt.h
	include/net/bluetooth/smp.h
	include/net/cfg80211.h
	include/net/ip.h
	include/net/ipip.h
	kernel/cgroup.c
	kernel/events/core.c
	kernel/sched/fair.c
	lib/show_mem.c
	mm/huge_memory.c
	mm/memcontrol.c
	mm/oom_kill.c
	mm/page_alloc.c
	net/bluetooth/af_bluetooth.c
	net/bluetooth/hci_conn.c
	net/bluetooth/hci_core.c
	net/bluetooth/hci_event.c
	net/bluetooth/hci_sock.c
	net/bluetooth/hidp/core.c
	net/bluetooth/l2cap_core.c
	net/bluetooth/l2cap_sock.c
	net/bluetooth/mgmt.c
	net/bluetooth/rfcomm/sock.c
	net/bluetooth/rfcomm/tty.c
	net/bluetooth/sco.c
	net/bluetooth/smp.c
	net/bridge/br_private.h
	net/bridge/br_stp.c
	net/bridge/br_stp_if.c
	net/caif/cfctrl.c
	net/core/flow_dissector.c
	net/core/netpoll.c
	net/ipv4/igmp.c
	net/ipv4/inetpeer.c
	net/ipv4/ip_output.c
	net/ipv4/ipmr.c
	net/ipv4/raw.c
	net/ipv4/xfrm4_mode_tunnel.c
	net/ipv6/ip6_output.c
	net/ipv6/mcast.c
	net/netfilter/ipvs/ip_vs_xmit.c
	net/sctp/ipv6.c
	net/sctp/sm_sideeffect.c
	net/sctp/socket.c
	net/wireless/nl80211.c
	scripts/kernel-doc
	sound/core/compress_offload.c
	sound/pci/hda/hda_intel.c
	sound/soc/codecs/88pm860x-codec.c
	sound/soc/codecs/max98095.c
	sound/soc/codecs/wm8960.c
	sound/soc/msm/msm-pcm-lpa.c
	sound/soc/msm/qdsp6/q6adm.c
	tools/perf/util/map.c

'Merge.