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

Conflicts:
	Makefile
	arch/alpha/kernel/sys_nautilus.c
	arch/arm/configs/cyanogen_d2-r530_defconfig
	arch/arm/configs/cyanogen_d2att_defconfig
	arch/arm/configs/cyanogen_d2cri_defconfig
	arch/arm/configs/cyanogen_d2spr_defconfig
	arch/arm/configs/cyanogen_d2vzw_defconfig
	arch/arm/include/asm/signal.h
	arch/arm/mach-cns3xxx/core.c
	arch/arm/mach-cns3xxx/include/mach/cns3xxx.h
	arch/arm/mach-msm/Kconfig
	arch/arm/mach-msm/board-8064-regulator.c
	arch/arm/mach-msm/board-8064.c
	arch/arm/mach-msm/board-8930-camera.c
	arch/arm/mach-msm/board-8930.c
	arch/arm/mach-msm/board-8960.c
	arch/arm/mach-msm/board-m2_att.c
	arch/arm/mach-msm/board-m2_spr.c
	arch/arm/mach-msm/board-m2_vzw.c
	arch/arm/mach-msm/clock-8960.c
	arch/arm/mach-msm/devices-8064.c
	arch/arm/mach-msm/devices-8930.c
	arch/arm/mach-msm/devices-8960.c
	arch/arm/mach-msm/devices.h
	arch/arm/mach-msm/ebi_erp.c
	arch/arm/mach-msm/hotplug.c
	arch/arm/mach-msm/modem-8960.c
	arch/arm/mach-msm/no-pm.c
	arch/arm/mach-msm/pm-8x60.c
	arch/arm/mach-msm/pm-data.c
	arch/arm/mach-msm/pm.h
	arch/arm/mach-msm/ramdump.c
	arch/arm/mach-msm/subsystem_restart.c
	arch/avr32/include/asm/signal.h
	arch/cris/include/asm/signal.h
	arch/h8300/include/asm/signal.h
	arch/m32r/include/asm/signal.h
	arch/m68k/include/asm/signal.h
	arch/mn10300/include/asm/signal.h
	arch/powerpc/include/asm/signal.h
	arch/powerpc/platforms/pseries/lpar.c
	arch/s390/include/asm/signal.h
	arch/sparc/include/asm/signal.h
	arch/tile/kernel/setup.c
	arch/x86/boot/compressed/Makefile
	arch/x86/include/asm/paravirt.h
	arch/x86/include/asm/paravirt_types.h
	arch/x86/include/asm/signal.h
	arch/x86/include/asm/syscall.h
	arch/x86/kernel/paravirt.c
	arch/x86/lguest/boot.c
	arch/x86/lib/usercopy_64.c
	arch/x86/mm/fault.c
	arch/x86/xen/mmu.c
	arch/xtensa/include/asm/signal.h
	block/blk-sysfs.c
	block/row-iosched.c
	crypto/gcm.c
	drivers/ata/ata_piix.c
	drivers/ata/libata-core.c
	drivers/base/regmap/regcache-rbtree.c
	drivers/block/aoe/aoecmd.c
	drivers/block/loop.c
	drivers/block/xen-blkback/blkback.c
	drivers/block/xen-blkback/common.h
	drivers/bluetooth/ath3k.c
	drivers/bluetooth/btusb.c
	drivers/char/msm_rotator.c
	drivers/eisa/pci_eisa.c
	drivers/firmware/efivars.c
	drivers/gpu/drm/drm_edid.c
	drivers/gpu/drm/i915/i915_debugfs.c
	drivers/gpu/drm/i915/i915_gem_execbuffer.c
	drivers/gpu/drm/i915/i915_gem_gtt.c
	drivers/gpu/drm/i915/intel_display.c
	drivers/gpu/drm/i915/intel_opregion.c
	drivers/gpu/drm/radeon/ni.c
	drivers/gpu/drm/radeon/radeon_benchmark.c
	drivers/gpu/drm/udl/udl_connector.c
	drivers/gpu/msm/adreno_a2xx.c
	drivers/hid/hid-ids.h
	drivers/hid/usbhid/hid-quirks.c
	drivers/hwspinlock/hwspinlock_core.c
	drivers/infiniband/ulp/ipoib/ipoib_cm.c
	drivers/iommu/amd_iommu.c
	drivers/media/dvb/dvb-core/dvb_demux.c
	drivers/media/video/msm/msm_mctl_pp.c
	drivers/media/video/msm/sensors/ov8825_v4l2.c
	drivers/media/video/msm/sensors/ov9724_v4l2.c
	drivers/misc/fsa9485.c
	drivers/motor/immvibespi.c
	drivers/motor/tspdrv.c
	drivers/mtd/mtdchar.c
	drivers/net/bonding/bond_main.c
	drivers/net/bonding/bond_sysfs.c
	drivers/net/can/sja1000/plx_pci.c
	drivers/net/can/sja1000/sja1000.c
	drivers/net/can/sja1000/sja1000.h
	drivers/net/ethernet/atheros/atl1e/atl1e.h
	drivers/net/ethernet/atheros/atl1e/atl1e_main.c
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h
	drivers/net/ethernet/broadcom/tg3.c
	drivers/net/ethernet/davicom/dm9000.c
	drivers/net/ethernet/davicom/dm9000.h
	drivers/net/ethernet/marvell/sky2.c
	drivers/net/ethernet/marvell/sky2.h
	drivers/net/ethernet/micrel/ks8851.c
	drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
	drivers/net/ethernet/realtek/r8169.c
	drivers/net/ethernet/sfc/bitfield.h
	drivers/net/ethernet/sfc/efx.c
	drivers/net/ethernet/sfc/efx.h
	drivers/net/ethernet/sfc/falcon.c
	drivers/net/ethernet/sfc/mcdi.c
	drivers/net/ethernet/sfc/mcdi.h
	drivers/net/ethernet/sfc/net_driver.h
	drivers/net/ethernet/sfc/nic.c
	drivers/net/ethernet/sfc/nic.h
	drivers/net/ethernet/sfc/rx.c
	drivers/net/ethernet/sfc/selftest.c
	drivers/net/ethernet/sfc/siena.c
	drivers/net/ethernet/sfc/siena_sriov.c
	drivers/net/ethernet/ti/cpsw.c
	drivers/net/ethernet/ti/davinci_emac.c
	drivers/net/netconsole.c
	drivers/net/usb/smsc75xx.c
	drivers/net/wireless/ath/ath9k/ar9003_calib.c
	drivers/net/wireless/b43/dma.c
	drivers/net/wireless/b43/phy_n.c
	drivers/net/wireless/mwifiex/join.c
	drivers/net/wireless/rt2x00/rt2x00dev.c
	drivers/net/wireless/rt2x00/rt2x00pci.c
	drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
	drivers/net/wireless/rtlwifi/usb.c
	drivers/platform/x86/asus-laptop.c
	drivers/scsi/libsas/sas_expander.c
	drivers/spi/spi-mpc512x-psc.c
	drivers/spi/spi-s3c64xx.c
	drivers/staging/comedi/drivers/s626.c
	drivers/target/iscsi/iscsi_target_auth.c
	drivers/target/target_core_alua.c
	drivers/thermal/thermal_sys.c
	drivers/tty/serial/atmel_serial.c
	drivers/tty/serial/sunsu.c
	drivers/tty/vt/vc_screen.c
	drivers/usb/class/cdc-acm.c
	drivers/usb/core/hcd-pci.c
	drivers/usb/gadget/ci13xxx_udc.c
	drivers/usb/gadget/ci13xxx_udc.h
	drivers/usb/gadget/udc-core.c
	drivers/usb/host/xhci-ring.c
	drivers/usb/host/xhci.c
	drivers/usb/host/xhci.h
	drivers/usb/serial/ftdi_sio.c
	drivers/usb/serial/ftdi_sio_ids.h
	drivers/usb/serial/garmin_gps.c
	drivers/usb/serial/io_ti.c
	drivers/usb/serial/usb-serial.c
	drivers/usb/storage/unusual_devs.h
	drivers/vhost/net.c
	drivers/video/msm/mdp4_overlay.c
	drivers/video/msm/mdp4_overlay_dsi_video.c
	drivers/video/msm/mdp4_overlay_writeback.c
	fs/binfmt_em86.c
	fs/binfmt_misc.c
	fs/binfmt_script.c
	fs/block_dev.c
	fs/btrfs/extent-tree.c
	fs/btrfs/extent_io.c
	fs/btrfs/extent_io.h
	fs/btrfs/inode.c
	fs/btrfs/scrub.c
	fs/cifs/asn1.c
	fs/cifs/connect.c
	fs/exec.c
	fs/ext4/balloc.c
	fs/ext4/ext4.h
	fs/ext4/extents.c
	fs/ext4/ialloc.c
	fs/ext4/inode.c
	fs/ext4/mballoc.c
	fs/ext4/resize.c
	fs/ext4/super.c
	fs/inode.c
	fs/isofs/export.c
	fs/jbd2/transaction.c
	fs/nfs/blocklayout/blocklayoutdm.c
	fs/nfsd/nfs4xdr.c
	fs/reiserfs/xattr.c
	fs/sysfs/dir.c
	fs/ubifs/super.c
	fs/udf/namei.c
	fs/udf/udf_sb.h
	include/asm-generic/signal.h
	include/drm/drm_pciids.h
	include/linux/ata.h
	include/linux/binfmts.h
	include/linux/diagchar.h
	include/linux/kref.h
	include/linux/libata.h
	include/linux/mfd/wcd9xxx/wcd9304_registers.h
	include/linux/msm_mdp.h
	include/linux/msm_rotator.h
	include/linux/preempt.h
	include/linux/printk.h
	include/linux/skbuff.h
	include/linux/spinlock_up.h
	include/linux/thermal.h
	include/linux/unix_diag.h
	include/net/inet_frag.h
	include/net/ip_fib.h
	include/xen/interface/io/blkif.h
	kernel/panic.c
	kernel/printk.c
	kernel/sched/clock.c
	kernel/signal.c
	kernel/sys.c
	kernel/time/tick-broadcast.c
	kernel/time/tick-sched.c
	kernel/trace/ftrace.c
	kernel/trace/trace.c
	kernel/trace/trace.h
	kernel/trace/trace_irqsoff.c
	kernel/trace/trace_sched_wakeup.c
	lib/kobject.c
	mm/hugetlb.c
	mm/mmap.c
	mm/nommu.c
	net/8021q/vlan.c
	net/bluetooth/sco.c
	net/can/gw.c
	net/core/dev.c
	net/core/rtnetlink.c
	net/ipv4/inet_fragment.c
	net/ipv4/ip_fragment.c
	net/ipv4/ip_options.c
	net/ipv4/tcp.c
	net/ipv4/tcp_input.c
	net/ipv4/tcp_output.c
	net/ipv6/addrconf.c
	net/ipv6/ip6_input.c
	net/ipv6/netfilter/nf_conntrack_reasm.c
	net/ipv6/reassembly.c
	net/irda/af_irda.c
	net/netlink/genetlink.c
	net/sctp/associola.c
	net/sctp/sm_statefuns.c
	net/sunrpc/sched.c
	net/unix/af_unix.c
	security/keys/keyctl.c
	sound/pci/hda/hda_codec.c
	sound/pci/hda/hda_eld.c
	sound/pci/hda/patch_conexant.c
	sound/pci/hda/patch_realtek.c
	sound/soc/codecs/wcd9304-tables.c
	sound/soc/codecs/wcd9304.c
	sound/soc/codecs/wm8903.c
	sound/soc/msm/msm-pcm-routing.c
	sound/soc/msm/qdsp6/q6voice.c
	sound/soc/msm/qdsp6/q6voice.h
	sound/soc/sh/dma-sh7760.c
	sound/usb/mixer.c
	sound/usb/mixer_quirks.c
	sound/usb/quirks.c
	tools/hv/hv_kvp_daemon.c

'Merge'