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

Conflicts:
	Documentation/mmc/mmc-dev-attrs.txt
	Makefile
	arch/arm/configs/at91sam9g45_defconfig
	arch/arm/include/asm/pgtable.h
	arch/arm/kernel/perf_event.c
	arch/arm/mach-at91/setup.c
	arch/arm/mach-msm/board-8064-display.c
	arch/arm/mach-msm/board-8064.c
	arch/arm/mach-msm/board-8930-camera.c
	arch/arm/mach-msm/board-8930-display.c
	arch/arm/mach-msm/board-8930.c
	arch/arm/mach-msm/board-8960-camera.c
	arch/arm/mach-msm/board-8960-display.c
	arch/arm/mach-msm/board-8960.c
	arch/arm/mach-msm/devices-8930.c
	arch/arm/mach-msm/include/mach/board.h
	arch/arm/mach-msm/pm-8x60.c
	arch/arm/mach-msm/qdsp6v2/audio_acdb.c
	arch/arm/mm/cache-feroceon-l2.c
	arch/arm/mm/proc-arm920.S
	arch/arm/mm/proc-arm926.S
	arch/arm/mm/proc-sa1100.S
	arch/arm/mm/proc-v6.S
	arch/arm/mm/proc-xsc3.S
	arch/arm/mm/proc-xscale.S
	arch/avr32/configs/favr-32_defconfig
	arch/avr32/configs/merisc_defconfig
	arch/ia64/include/asm/futex.h
	arch/ia64/include/asm/mca.h
	arch/ia64/kernel/irq.c
	arch/ia64/kernel/mca.c
	arch/ia64/kvm/vtlb.c
	arch/powerpc/include/asm/ppc-opcode.h
	arch/powerpc/kernel/head_64.S
	arch/powerpc/kernel/traps.c
	arch/powerpc/mm/numa.c
	arch/powerpc/platforms/cell/spufs/inode.c
	arch/sparc/include/asm/pgtable_64.h
	arch/sparc/include/asm/switch_to_64.h
	arch/sparc/include/asm/tlbflush_64.h
	arch/sparc/kernel/smp_64.c
	arch/sparc/mm/tlb.c
	arch/sparc/mm/tsb.c
	arch/sparc/mm/ultra.S
	arch/x86/include/asm/kvm_host.h
	arch/x86/kernel/cpu/perf_event_intel.c
	arch/x86/kernel/cpu/perf_event_intel_lbr.c
	arch/x86/kernel/irq.c
	arch/x86/kvm/emulate.c
	arch/x86/kvm/x86.c
	arch/x86/mm/init.c
	arch/x86/xen/enlighten.c
	arch/x86/xen/time.c
	crypto/algif_hash.c
	crypto/algif_skcipher.c
	drivers/acpi/pci_root.c
	drivers/char/hpet.c
	drivers/cpufreq/longhaul.c
	drivers/gpu/drm/i915/intel_dvo.c
	drivers/gpu/drm/i915/intel_lvds.c
	drivers/gpu/drm/radeon/atom.c
	drivers/gpu/drm/radeon/evergreen.c
	drivers/gpu/drm/radeon/evergreen_reg.h
	drivers/gpu/drm/radeon/ni.c
	drivers/gpu/drm/radeon/nid.h
	drivers/gpu/drm/radeon/radeon_atombios.c
	drivers/gpu/drm/radeon/radeon_pm.c
	drivers/gpu/drm/radeon/si.c
	drivers/gpu/drm/radeon/sid.h
	drivers/gpu/ion/msm/msm_ion.c
	drivers/gpu/msm/kgsl_events.c
	drivers/gpu/vga/vga_switcheroo.c
	drivers/i2c/busses/i2c-xiic.c
	drivers/md/md.c
	drivers/media/radio/radio-iris.c
	drivers/media/video/msm/csi/msm_ispif.c
	drivers/media/video/msm/msm.c
	drivers/media/video/msm/sensors/ov8825_v4l2.c
	drivers/media/video/msm/server/msm_cam_server.c
	drivers/media/video/msm/vfe/msm_vfe32.c
	drivers/media/video/msm/vfe/msm_vfe32.h
	drivers/media/video/videobuf2-msm-mem.c
	drivers/mfd/adp5520.c
	drivers/mfd/pm8xxx-misc.c
	drivers/mmc/card/block.c
	drivers/mmc/core/core.c
	drivers/mmc/core/core.h
	drivers/mmc/core/host.c
	drivers/mmc/core/mmc.c
	drivers/mmc/core/sd.c
	drivers/mmc/host/Kconfig
	drivers/mmc/host/atmel-mci.c
	drivers/mmc/host/msm_sdcc.c
	drivers/mmc/host/msm_sdcc.h
	drivers/mtd/mtdchar.c
	drivers/net/bonding/bond_main.c
	drivers/net/can/sja1000/sja1000_of_platform.c
	drivers/net/ethernet/atheros/atl1e/atl1e.h
	drivers/net/ethernet/atheros/atl1e/atl1e_main.c
	drivers/net/ethernet/freescale/gianfar_ptp.c
	drivers/net/ethernet/ibm/ibmveth.c
	drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
	drivers/net/ethernet/realtek/r8169.c
	drivers/net/wireless/ath/ath9k/ar9580_1p0_initvals.h
	drivers/net/wireless/ath/ath9k/htc_drv_init.c
	drivers/net/wireless/b43/phy_n.c
	drivers/net/wireless/mwifiex/pcie.c
	drivers/pci/pci.c
	drivers/power/pm8921-bms.c
	drivers/power/pm8xxx-ccadc.c
	drivers/rtc/rtc-cmos.c
	drivers/s390/char/sclp_cmd.c
	drivers/ssb/driver_chipcommon_pmu.c
	drivers/tty/pty.c
	drivers/tty/serial/msm_serial_hs.c
	drivers/tty/serial/serial_core.c
	drivers/tty/tty_io.c
	drivers/usb/core/devio.c
	drivers/usb/host/xhci-ring.c
	drivers/usb/misc/appledisplay.c
	drivers/usb/serial/ftdi_sio.c
	drivers/usb/serial/ftdi_sio_ids.h
	drivers/usb/serial/option.c
	drivers/usb/storage/cypress_atacb.c
	drivers/video/console/fbcon.c
	drivers/video/fbmem.c
	drivers/video/msm/mdp4_overlay.c
	drivers/video/msm/msm_dss_io_8960.c
	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_properties.c
	drivers/video/msm/vidc/common/enc/venc.c
	fs/aio.c
	fs/autofs4/expire.c
	fs/btrfs/tree-log.c
	fs/dcache.c
	fs/exec.c
	fs/ext4/Kconfig
	fs/ext4/ext4_jbd2.h
	fs/ext4/mballoc.c
	fs/ext4/resize.c
	fs/ext4/super.c
	fs/fscache/stats.c
	fs/hfsplus/extents.c
	fs/jbd2/commit.c
	fs/lockd/clntlock.c
	fs/lockd/clntproc.c
	fs/nfs/nfs4proc.c
	fs/nfsd/nfs4state.c
	fs/nfsd/nfs4xdr.c
	fs/sysfs/dir.c
	include/asm-generic/pgtable.h
	include/drm/drm_pciids.h
	include/linux/ipc_namespace.h
	include/linux/jbd2.h
	include/linux/kvm_host.h
	include/linux/kvm_types.h
	include/linux/mfd/pm8xxx/misc.h
	include/linux/mfd/wcd9xxx/wcd9304_registers.h
	include/linux/mm.h
	include/linux/mmc/host.h
	include/linux/msm_ion.h
	include/linux/netdevice.h
	include/linux/skbuff.h
	include/linux/socket.h
	include/linux/ssb/ssb_driver_chipcommon.h
	include/media/radio-iris.h
	include/net/scm.h
	ipc/shm.c
	kernel/audit_tree.c
	kernel/cgroup.c
	kernel/events/core.c
	kernel/hrtimer.c
	kernel/sched/core.c
	kernel/signal.c
	kernel/time/tick-broadcast.c
	kernel/time/tick-common.c
	kernel/trace/ftrace.c
	kernel/trace/trace.c
	kernel/trace/trace_selftest.c
	kernel/trace/trace_stack.c
	kernel/trace/trace_stat.c
	mm/hugetlb.c
	mm/memory.c
	mm/mmap.c
	net/atm/common.c
	net/ax25/af_ax25.c
	net/bluetooth/af_bluetooth.c
	net/bluetooth/rfcomm/sock.c
	net/caif/caif_socket.c
	net/core/dev.c
	net/core/dev_addr_lists.c
	net/core/rtnetlink.c
	net/core/sock.c
	net/ipv4/esp4.c
	net/ipv4/ip_fragment.c
	net/ipv4/syncookies.c
	net/ipv4/tcp_input.c
	net/ipv4/tcp_output.c
	net/ipv6/addrconf.c
	net/ipv6/reassembly.c
	net/irda/af_irda.c
	net/iucv/af_iucv.c
	net/llc/af_llc.c
	net/netfilter/ipvs/ip_vs_pe_sip.c
	net/netrom/af_netrom.c
	net/nfc/llcp/sock.c
	net/rose/af_rose.c
	net/sched/sch_cbq.c
	net/sctp/auth.c
	net/tipc/socket.c
	net/unix/af_unix.c
	net/wireless/reg.c
	sound/core/pcm_native.c
	sound/soc/codecs/max98088.c
	sound/soc/msm/msm-pcm-voice.c
	sound/usb/card.c
	sound/usb/midi.c
	sound/usb/stream.c
	virt/kvm/ioapic.c
	virt/kvm/kvm_main.c

'Merge'