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

Conflicts:
	Documentation/sysctl/kernel.txt
	Makefile
	arch/arm/configs/cyanogen_d2_defconfig
	arch/arm/configs/cyanogen_expressatt_defconfig
	arch/arm/mach-integrator/integrator_cp.c
	arch/arm/mach-msm/board-8930.c
	arch/arm/mach-msm/board-8960.c
	arch/arm/mach-msm/include/mach/mdm2.h
	arch/arm/mach-msm/mdm_common.c
	arch/arm/mach-msm/modem-8960.c
	arch/arm/mach-msm/qdsp6v2/pcm_in.c
	arch/arm/mach-msm/qdsp6v2/pcm_out.c
	arch/arm/mach-sa1100/assabet.c
	arch/avr32/boot/u-boot/head.S
	arch/avr32/kernel/entry-avr32b.S
	arch/avr32/kernel/head.S
	arch/powerpc/kernel/signal_32.c
	arch/powerpc/kernel/signal_64.c
	arch/sparc/mm/init_32.c
	arch/tile/mm/pgtable.c
	block/blk-core.c
	block/elevator.c
	crypto/algif_hash.c
	crypto/algif_skcipher.c
	drivers/ata/ahci.c
	drivers/ata/libahci.c
	drivers/ata/libata-core.c
	drivers/ata/libata-transport.c
	drivers/atm/idt77252.c
	drivers/block/loop.c
	drivers/block/xen-blkback/blkback.c
	drivers/connector/cn_proc.c
	drivers/crypto/msm/qcedev.c
	drivers/gpu/drm/i915/intel_display.c
	drivers/gpu/drm/nouveau/nouveau_gem.c
	drivers/gpu/drm/radeon/radeon_legacy_crtc.c
	drivers/gpu/drm/radeon/sid.h
	drivers/gpu/drm/ttm/ttm_bo_util.c
	drivers/hid/hid-apple.c
	drivers/hid/hid-picolcd.c
	drivers/hid/hid-roccat-kovaplus.c
	drivers/infiniband/hw/ipath/ipath_user_sdma.c
	drivers/input/serio/i8042-x86ia64io.h
	drivers/input/touchscreen/cyttsp-i2c-qc.c
	drivers/iommu/intel-iommu.c
	drivers/isdn/isdnloop/isdnloop.c
	drivers/isdn/mISDN/socket.c
	drivers/md/dm-crypt.c
	drivers/md/dm-delay.c
	drivers/md/dm-flakey.c
	drivers/md/dm-ioctl.c
	drivers/md/dm-linear.c
	drivers/md/dm-mpath.c
	drivers/md/dm-raid.c
	drivers/md/dm-raid1.c
	drivers/md/dm-snap.c
	drivers/md/dm-stripe.c
	drivers/md/dm-table.c
	drivers/md/dm-thin.c
	drivers/md/dm-verity.c
	drivers/md/md.c
	drivers/media/radio/radio-iris-transport.c
	drivers/media/radio/radio-iris.c
	drivers/misc/qseecom.c
	drivers/mmc/card/block.c
	drivers/mtd/nand/gpmi-nand/gpmi-nand.c
	drivers/mtd/nand/nand_base.c
	drivers/net/bonding/bond_sysfs.c
	drivers/net/can/flexcan.c
	drivers/net/ppp/pppoe.c
	drivers/net/usb/rmnet_usb_data.c
	drivers/net/wireless/mwifiex/sdio.c
	drivers/net/wireless/prism54/islpci_dev.c
	drivers/net/wireless/rt2x00/rt2400pci.c
	drivers/net/wireless/rtlwifi/rtl8192cu/mac.c
	drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
	drivers/net/wireless/rtlwifi/rtl8192de/trx.c
	drivers/net/wireless/rtlwifi/rtl8192se/rf.c
	drivers/net/wireless/rtlwifi/rtl8192se/trx.c
	drivers/pci/pcie/portdrv_pci.c
	drivers/power/pm8921-charger.c
	drivers/s390/net/qeth_core_main.c
	drivers/staging/media/lirc/lirc_zilog.c
	drivers/staging/prima/CORE/MAC/src/include/cfgGlobal.h
	drivers/staging/tidspbridge/Kconfig
	drivers/staging/vt6656/baseband.c
	drivers/staging/vt6656/rndis.h
	drivers/target/iscsi/iscsi_target_auth.c
	drivers/target/iscsi/iscsi_target_nego.c
	drivers/tty/serial/msm_serial_hs.c
	drivers/video/backlight/atmel-pwm-bl.c
	drivers/video/kyro/fbdev.c
	drivers/video/msm/mdp4.h
	drivers/video/msm/mdp4_overlay.c
	drivers/video/msm/mdp4_overlay_dsi_video.c
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_properties.c
	fs/devpts/inode.c
	fs/ext4/xattr.c
	fs/nfsd/nfssvc.c
	include/linux/device-mapper.h
	include/linux/mm_inline.h
	include/linux/mmzone.h
	include/linux/msm_rmnet.h
	include/linux/mtd/map.h
	include/linux/net.h
	include/linux/random.h
	include/linux/swap.h
	include/linux/vmstat.h
	include/net/ip.h
	include/net/ipv6.h
	include/trace/ftrace.h
	kernel/audit.c
	kernel/cpuset.c
	kernel/power/snapshot.c
	kernel/time/alarmtimer.c
	kernel/trace/ftrace.c
	lib/random32.c
	lib/vsprintf.c
	mm/internal.h
	mm/mmap.c
	mm/nommu.c
	mm/page-writeback.c
	mm/page_alloc.c
	mm/swap_state.c
	mm/swapfile.c
	mm/vmscan.c
	mm/vmstat.c
	net/appletalk/ddp.c
	net/atm/common.c
	net/ax25/af_ax25.c
	net/bluetooth/af_bluetooth.c
	net/bluetooth/hci_sock.c
	net/bridge/br_if.c
	net/caif/caif_socket.c
	net/compat.c
	net/core/dev.c
	net/core/fib_rules.c
	net/core/iovec.c
	net/core/pktgen.c
	net/ieee802154/6lowpan.c
	net/ipv4/datagram.c
	net/ipv4/ip_sockglue.c
	net/ipv4/ping.c
	net/ipv4/raw.c
	net/ipv4/tcp_ipv4.c
	net/ipv4/udp.c
	net/ipv6/datagram.c
	net/ipv6/ip6_output.c
	net/ipv6/raw.c
	net/ipv6/route.c
	net/ipv6/udp.c
	net/ipx/af_ipx.c
	net/irda/af_irda.c
	net/iucv/af_iucv.c
	net/key/af_key.c
	net/l2tp/l2tp_ip.c
	net/l2tp/l2tp_ppp.c
	net/llc/af_llc.c
	net/netlink/af_netlink.c
	net/netrom/af_netrom.c
	net/nfc/rawsock.c
	net/packet/af_packet.c
	net/phonet/datagram.c
	net/rds/recv.c
	net/rose/af_rose.c
	net/rxrpc/ar-recvmsg.c
	net/socket.c
	net/tipc/socket.c
	net/unix/af_unix.c
	net/x25/af_x25.c
	security/selinux/netlabel.c
	sound/pci/hda/patch_realtek.c
	sound/soc/blackfin/bf5xx-i2s.c
	sound/soc/codecs/ak4642.c
	sound/soc/codecs/wm8962.c
	virt/kvm/kvm_main.c

'Merge