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

Conflicts:
	Makefile
	arch/arm/kernel/perf_event.c
	arch/arm/mach-msm/board-8960-regulator.c
	arch/powerpc/include/asm/module.h
	arch/powerpc/kernel/vmlinux.lds.S
	arch/s390/include/asm/pgtable.h
	arch/sparc/kernel/asm-offsets.c
	arch/sparc/mm/hypersparc.S
	arch/sparc/mm/init_64.c
	arch/sparc/mm/swift.S
	arch/sparc/mm/tlb.c
	arch/sparc/mm/tsunami.S
	arch/sparc/mm/viking.S
	arch/x86/xen/time.c
	drivers/acpi/acpi_memhotplug.c
	drivers/acpi/ec.c
	drivers/ata/Kconfig
	drivers/ata/ahci.c
	drivers/ata/ata_piix.c
	drivers/ata/libahci.c
	drivers/ata/libata-pmp.c
	drivers/ata/sata_inic162x.c
	drivers/block/xen-blkback/blkback.c
	drivers/char/diag/diagfwd.c
	drivers/dma/pl330.c
	drivers/firewire/core-cdev.c
	drivers/firewire/ohci.c
	drivers/gpu/drm/radeon/atom.c
	drivers/gpu/drm/radeon/atombios_dp.c
	drivers/gpu/drm/radeon/radeon_combios.c
	drivers/gpu/msm/kgsl.c
	drivers/gpu/msm/kgsl_sharedmem.c
	drivers/iommu/amd_iommu.c
	drivers/md/dm-verity.c
	drivers/md/raid10.c
	drivers/md/raid5.c
	drivers/md/raid5.h
	drivers/media/radio/radio-iris.c
	drivers/media/video/msm/msm_mctl.c
	drivers/motor/immvibespi.c
	drivers/motor/tspdrv.c
	drivers/net/dummy.c
	drivers/net/ethernet/atheros/atl1e/atl1e_main.c
	drivers/net/ethernet/renesas/sh_eth.c
	drivers/net/ethernet/renesas/sh_eth.h
	drivers/net/ethernet/sun/sunvnet.c
	drivers/net/ifb.c
	drivers/net/macvtap.c
	drivers/net/virtio_net.c
	drivers/net/wireless/ath/ath9k/calib.c
	drivers/net/wireless/rt2x00/rt2800lib.c
	drivers/net/wireless/rt2x00/rt61pci.c
	drivers/net/wireless/rt2x00/rt73usb.c
	drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
	drivers/pci/quirks.c
	drivers/pcmcia/at91_cf.c
	drivers/power/pm8921-bms.c
	drivers/power/pm8921-charger.c
	drivers/rtc/rtc-rv3029c2.c
	drivers/s390/scsi/zfcp_aux.c
	drivers/s390/scsi/zfcp_fsf.c
	drivers/s390/scsi/zfcp_scsi.c
	drivers/scsi/bnx2fc/bnx2fc_io.c
	drivers/scsi/megaraid/megaraid_sas_base.c
	drivers/scsi/mpt2sas/mpt2sas_scsih.c
	drivers/scsi/qla2xxx/qla_iocb.c
	drivers/scsi/sd.c
	drivers/staging/comedi/comedi_fops.c
	drivers/target/iscsi/iscsi_target_configfs.c
	drivers/usb/core/hub.c
	drivers/usb/dwc3/core.h
	drivers/usb/dwc3/gadget.c
	drivers/usb/gadget/f_mass_storage.c
	drivers/usb/gadget/u_bam.c
	drivers/usb/gadget/u_ctrl_hsuart.c
	drivers/usb/gadget/u_data_hsuart.c
	drivers/usb/host/xhci-mem.c
	drivers/usb/host/xhci-pci.c
	drivers/usb/host/xhci-plat.c
	drivers/usb/host/xhci-ring.c
	drivers/usb/host/xhci.c
	drivers/usb/misc/sisusbvga/sisusb.c
	drivers/usb/serial/cp210x.c
	drivers/usb/serial/ftdi_sio.c
	drivers/usb/serial/ftdi_sio_ids.h
	drivers/usb/serial/option.c
	drivers/usb/serial/qcserial.c
	drivers/usb/serial/ti_usb_3410_5052.c
	drivers/usb/storage/unusual_devs.h
	drivers/video/msm/mdp4.h
	drivers/video/msm/mdp4_overlay.c
	drivers/video/msm/mdp4_overlay_dsi_cmd.c
	drivers/video/msm/mipi_samsung_oled.c
	drivers/video/msm/msm_fb.c
	drivers/video/msm/msm_fb.h
	drivers/video/msm/smart_mtp_s6e63m0.c
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl.c
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl.h
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_core.h
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_helper.c
	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_metadata.h
	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/vcd_ddl_shared_mem.h
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_vidc.c
	drivers/video/msm/vidc/1080p/ddl/vidc.c
	drivers/video/msm/vidc/1080p/ddl/vidc.h
	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/vcd/vcd.h
	drivers/video/msm/vidc/common/vcd/vcd_client_sm.c
	drivers/video/msm/vidc/common/vcd/vcd_sub.c
	drivers/virtio/virtio_ring.c
	drivers/xen/evtchn.c
	fs/block_dev.c
	fs/btrfs/extent-tree.c
	fs/cifs/cifs_unicode.h
	fs/cifs/cifsencrypt.c
	fs/cifs/inode.c
	fs/ext3/inode.c
	fs/ext3/namei.c
	fs/ext4/extents.c
	fs/ext4/inode.c
	fs/ext4/mballoc.c
	fs/ext4/namei.c
	fs/jbd2/transaction.c
	fs/lockd/svclock.c
	fs/ocfs2/xattr.c
	fs/super.c
	include/linux/battery/sec_charging_common.h
	include/linux/firewire-cdev.h
	include/linux/firewire.h
	include/linux/if_pppox.h
	include/linux/msm_mdp.h
	include/linux/msm_vidc_enc.h
	include/media/msm/vcd_api.h
	include/media/msm/vcd_property.h
	include/media/msm/vcd_status.h
	include/media/radio-iris.h
	include/net/addrconf.h
	include/net/udp.h
	kernel/events/core.c
	kernel/hrtimer.c
	kernel/irq/manage.c
	kernel/time/tick-broadcast.c
	kernel/timer.c
	kernel/trace/trace.c
	kernel/trace/trace_syscalls.c
	mm/page_alloc.c
	net/8021q/vlan_dev.c
	net/9p/trans_common.c
	net/bridge/br_multicast.c
	net/core/neighbour.c
	net/ipv4/tcp_ipv4.c
	net/ipv4/udp.c
	net/ipv6/addrconf.c
	net/ipv6/ip6_output.c
	net/ipv6/mcast.c
	net/ipv6/route.c
	net/ipv6/udp.c
	net/key/af_key.c
	net/l2tp/l2tp_ppp.c
	net/x25/af_x25.c
	sound/soc/codecs/max98088.c
	sound/soc/codecs/sgtl5000.h
	sound/soc/codecs/wm8962.c
	sound/soc/msm/apq8064.c
	sound/soc/msm/msm8930.c
	sound/soc/msm/msm8960.c
	sound/usb/6fire/pcm.c

'Merge'