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/cyanogen_d2_defconfig
	arch/arm/configs/cyanogen_expressatt_defconfig
	arch/m32r/boot/compressed/Makefile
	arch/m32r/boot/compressed/misc.c
	arch/powerpc/Kconfig
	arch/powerpc/include/asm/page.h
	arch/x86/kvm/emulate.c
	drivers/acpi/ec.c
	drivers/base/memory.c
	drivers/base/regmap/regmap.c
	drivers/gpu/drm/i915/i915_reg.h
	drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c
	drivers/gpu/msm/adreno.c
	drivers/gpu/msm/kgsl_pwrctrl.c
	drivers/gpu/msm/kgsl_pwrctrl.h
	drivers/hwmon/pm8xxx-adc-scale.c
	drivers/iommu/msm_iommu.c
	drivers/mmc/core/mmc.c
	drivers/net/bonding/bond_main.c
	drivers/net/ethernet/realtek/8139cp.c
	drivers/net/macvtap.c
	drivers/net/tun.c
	drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
	drivers/net/wireless/iwlegacy/4965-mac.c
	drivers/staging/android/ashmem.c
	drivers/target/target_core_cdb.c
	drivers/tty/hvc/hvsi_lib.c
	drivers/vhost/vhost.c
	fs/bio.c
	fs/jfs/jfs_dtree.c
	include/linux/icmpv6.h
	include/linux/ipv6.h
	net/bridge/br_multicast.c
	net/core/neighbour.c
	net/core/sysctl_net_core.c
	net/ipv4/fib_trie.c
	net/ipv4/tcp_cubic.c
	net/ipv6/addrconf.c
	net/ipv6/icmp.c
	net/ipv6/ip6_fib.c
	net/ipv6/ndisc.c
	net/ipv6/reassembly.c
	net/ipv6/tcp_ipv6.c
	net/sched/sch_htb.c
	net/sunrpc/xdr.c
	net/tipc/eth_media.c
	sound/isa/opti9xx/opti92x-ad1848.c
	sound/soc/codecs/wcd9304.c
	sound/usb/mixer.c

'Merge'