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

Conflicts:
	MAINTAINERS
	Makefile
	arch/arm/configs/msm8960_defconfig
	arch/arm/include/asm/cacheflush.h
	arch/arm/mach-kirkwood/ts219-setup.c
	arch/arm/mach-msm/bam_dmux.c
	arch/arm/mach-msm/board-8930-pmic.c
	arch/arm/mach-msm/include/mach/sec_debug.h
	arch/arm/mach-msm/ipc_router.c
	arch/arm/mach-msm/ipc_router.h
	arch/arm/mach-msm/ipc_router_smd_xprt.c
	arch/arm/mach-msm/msm_dcvs.c
	arch/arm/mach-msm/subsystem_restart.c
	arch/arm/mach-omap2/board-rx51-peripherals.c
	arch/arm/mm/flush.c
	arch/arm/mm/nommu.c
	arch/arm/plat-orion/common.c
	arch/avr32/kernel/module.c
	arch/m68k/kernel/head.S
	arch/powerpc/include/asm/exception-64s.h
	arch/powerpc/include/asm/rtas.h
	arch/powerpc/kernel/irq.c
	arch/powerpc/kernel/process.c
	arch/powerpc/kernel/rtas.c
	arch/powerpc/platforms/pseries/eeh_pseries.c
	arch/powerpc/platforms/pseries/suspend.c
	arch/tile/lib/exports.c
	arch/x86/kernel/relocate_kernel_64.S
	arch/x86/kvm/vmx.c
	arch/x86/kvm/x86.c
	arch/x86/um/sys_call_table_32.c
	arch/x86/xen/enlighten.c
	block/genhd.c
	crypto/algapi.c
	drivers/acpi/acpica/exfldio.c
	drivers/acpi/ec.c
	drivers/acpi/video.c
	drivers/ata/ata_piix.c
	drivers/ata/libata-core.c
	drivers/block/brd.c
	drivers/block/cciss.c
	drivers/block/drbd/drbd_receiver.c
	drivers/block/nbd.c
	drivers/cdrom/cdrom.c
	drivers/char/diag/diagchar_core.c
	drivers/char/ipmi/ipmi_bt_sm.c
	drivers/char/ipmi/ipmi_devintf.c
	drivers/char/msm_rotator.c
	drivers/clk/clk.c
	drivers/dma/pch_dma.c
	drivers/gpu/drm/drm_irq.c
	drivers/gpu/drm/drm_mm.c
	drivers/gpu/drm/gma500/cdv_intel_display.c
	drivers/gpu/drm/gma500/framebuffer.c
	drivers/gpu/drm/gma500/psb_intel_display.c
	drivers/gpu/drm/i915/intel_lvds.c
	drivers/gpu/drm/i915/intel_sdvo.c
	drivers/gpu/drm/radeon/atombios_encoders.c
	drivers/gpu/drm/radeon/evergreen.c
	drivers/gpu/drm/radeon/ni.c
	drivers/gpu/drm/radeon/r100.c
	drivers/gpu/drm/radeon/r300.c
	drivers/gpu/drm/radeon/r300_cmdbuf.c
	drivers/gpu/drm/radeon/r420.c
	drivers/gpu/drm/radeon/r520.c
	drivers/gpu/drm/radeon/r600.c
	drivers/gpu/drm/radeon/radeon_device.c
	drivers/gpu/drm/radeon/radeon_ttm.c
	drivers/gpu/drm/radeon/rs400.c
	drivers/gpu/drm/radeon/rs600.c
	drivers/gpu/drm/radeon/rs690.c
	drivers/gpu/drm/radeon/rv515.c
	drivers/gpu/drm/radeon/rv770.c
	drivers/gpu/drm/radeon/si.c
	drivers/gpu/msm/kgsl_pwrctrl.c
	drivers/hwmon/abituguru.c
	drivers/hwmon/adm1021.c
	drivers/i2c/busses/i2c-designware-core.c
	drivers/input/touchscreen/cyttsp_core.c
	drivers/input/touchscreen/synaptics_fw_update.c
	drivers/input/touchscreen/synaptics_i2c_rmi4.c
	drivers/iommu/amd_iommu.c
	drivers/iommu/amd_iommu_types.h
	drivers/leds/leds-ot200.c
	drivers/md/dm-snap.c
	drivers/md/dm-thin.c
	drivers/md/raid1.c
	drivers/md/raid10.c
	drivers/media/dvb/mantis/mantis_dvb.c
	drivers/media/radio/radio-iris.c
	drivers/media/video/msm/gemini/msm_gemini_hw.c
	drivers/media/video/msm/gemini/msm_gemini_hw.h
	drivers/media/video/msm/gemini/msm_gemini_sync.c
	drivers/media/video/msm/jpeg_10/msm_jpeg_sync.c
	drivers/media/video/msm/mercury/msm_mercury_sync.c
	drivers/media/video/msm/msm.c
	drivers/media/video/msm/msm.h
	drivers/media/video/msm/msm_mctl.c
	drivers/media/video/msm/msm_mctl_buf.c
	drivers/media/video/msm/msm_mctl_pp.c
	drivers/media/video/msm/msm_vpe.c
	drivers/media/video/msm/vfe/msm_vfe32.c
	drivers/media/video/msm_wfd/enc-mfc-subdev.c
	drivers/media/video/msm_zsl/gemini/msm_gemini_sync.c
	drivers/mfd/wcd9xxx-irq.c
	drivers/net/bonding/bond_alb.c
	drivers/net/bonding/bonding.h
	drivers/net/ethernet/3com/3c509.c
	drivers/net/ethernet/3com/3c59x.c
	drivers/net/ethernet/freescale/gianfar_ptp.c
	drivers/net/ethernet/realtek/8139cp.c
	drivers/net/ethernet/realtek/r8169.c
	drivers/net/ethernet/sfc/mcdi.c
	drivers/net/macvlan.c
	drivers/net/team/team_mode_roundrobin.c
	drivers/net/usb/qmi_wwan.c
	drivers/net/usb/rmnet_usb_ctrl.c
	drivers/net/wan/dlci.c
	drivers/net/wireless/ath/ath9k/Kconfig
	drivers/net/wireless/ath/ath9k/Makefile
	drivers/net/wireless/ath/ath9k/init.c
	drivers/net/wireless/ath/ath9k/main.c
	drivers/net/wireless/ath/ath9k/rc.h
	drivers/net/wireless/b43/dma.c
	drivers/net/wireless/b43/dma.h
	drivers/net/wireless/b43/main.c
	drivers/net/wireless/bcmdhd/Kconfig
	drivers/net/wireless/bcmdhd/Makefile
	drivers/net/wireless/bcmdhd/aiutils.c
	drivers/net/wireless/bcmdhd/bcmsdh_sdmmc.c
	drivers/net/wireless/bcmdhd/bcmsdspi_linux.c
	drivers/net/wireless/bcmdhd/bcmspibrcm.c
	drivers/net/wireless/bcmdhd/bcmwifi_channels.c
	drivers/net/wireless/bcmdhd/bcmwifi_channels.h
	drivers/net/wireless/bcmdhd/bcmwifi_rates.h
	drivers/net/wireless/bcmdhd/dhd_cdc.c
	drivers/net/wireless/bcmdhd/dhd_custom_sec.c
	drivers/net/wireless/bcmdhd/dhd_linux.c
	drivers/net/wireless/bcmdhd/dhd_sdio.c
	drivers/net/wireless/bcmdhd/dhd_sec_feature.h
	drivers/net/wireless/bcmdhd/include/bcm_cfg.h
	drivers/net/wireless/bcmdhd/include/bcmdevs.h
	drivers/net/wireless/bcmdhd/include/bcmnvram.h
	drivers/net/wireless/bcmdhd/include/bcmsdh_sdmmc.h
	drivers/net/wireless/bcmdhd/include/bcmsdstd.h
	drivers/net/wireless/bcmdhd/include/bcmsrom_tbl.h
	drivers/net/wireless/bcmdhd/include/bcmutils.h
	drivers/net/wireless/bcmdhd/include/epivers.h
	drivers/net/wireless/bcmdhd/include/hndpmu.h
	drivers/net/wireless/bcmdhd/include/linux_osl.h
	drivers/net/wireless/bcmdhd/include/linuxver.h
	drivers/net/wireless/bcmdhd/include/osl.h
	drivers/net/wireless/bcmdhd/include/proto/802.11.h
	drivers/net/wireless/bcmdhd/include/proto/bcmevent.h
	drivers/net/wireless/bcmdhd/include/proto/bcmip.h
	drivers/net/wireless/bcmdhd/include/proto/ethernet.h
	drivers/net/wireless/bcmdhd/include/proto/p2p.h
	drivers/net/wireless/bcmdhd/include/proto/vlan.h
	drivers/net/wireless/bcmdhd/include/proto/wpa.h
	drivers/net/wireless/bcmdhd/include/sbchipc.h
	drivers/net/wireless/bcmdhd/include/sbhnddma.h
	drivers/net/wireless/bcmdhd/include/sbpcmcia.h
	drivers/net/wireless/bcmdhd/include/sbsdio.h
	drivers/net/wireless/bcmdhd/include/wlioctl.h
	drivers/net/wireless/bcmdhd/linux_osl.c
	drivers/net/wireless/bcmdhd/siutils.c
	drivers/net/wireless/bcmdhd/wl_android.c
	drivers/net/wireless/bcmdhd/wl_cfg80211.c
	drivers/net/wireless/bcmdhd/wl_cfg80211.h
	drivers/net/wireless/bcmdhd/wl_cfgp2p.c
	drivers/net/wireless/bcmdhd/wl_cfgp2p.h
	drivers/net/wireless/bcmdhd/wl_dbg.h
	drivers/net/wireless/bcmdhd/wl_iw.c
	drivers/net/wireless/mwifiex/cmdevt.c
	drivers/net/wireless/mwifiex/sta_ioctl.c
	drivers/net/wireless/wcnss/wcnss_wlan.c
	drivers/net/xen-netback/netback.c
	drivers/platform/x86/hp_accel.c
	drivers/platform/x86/thinkpad_acpi.c
	drivers/power/charger-manager.c
	drivers/power/pm8921-bms.c
	drivers/rtc/rtc-pcf2123.c
	drivers/rtc/rtc-twl.c
	drivers/scsi/osd/osd_uld.c
	drivers/scsi/sd.c
	drivers/scsi/sd.h
	drivers/staging/android/logger.c
	drivers/staging/vt6656/hostap.c
	drivers/target/iscsi/iscsi_target_erl0.c
	drivers/target/iscsi/iscsi_target_erl1.c
	drivers/target/iscsi/iscsi_target_parameters.c
	drivers/target/iscsi/iscsi_target_parameters.h
	drivers/tty/n_smux.c
	drivers/tty/n_tty.c
	drivers/tty/serial/8250/8250_pci.c
	drivers/tty/serial/msm_serial_hs.c
	drivers/tty/serial/pch_uart.c
	drivers/usb/atm/cxacru.c
	drivers/usb/core/quirks.c
	drivers/usb/gadget/composite.c
	drivers/usb/host/ehci-sched.c
	drivers/usb/host/uhci-hub.c
	drivers/usb/host/xhci-mem.c
	drivers/usb/host/xhci.c
	drivers/usb/serial/ark3116.c
	drivers/usb/serial/cypress_m8.c
	drivers/usb/serial/cypress_m8.h
	drivers/usb/serial/ftdi_sio.c
	drivers/usb/serial/ftdi_sio_ids.h
	drivers/usb/serial/io_ti.c
	drivers/usb/serial/iuu_phoenix.c
	drivers/usb/serial/keyspan.c
	drivers/usb/serial/mos7720.c
	drivers/usb/serial/option.c
	drivers/usb/serial/ti_usb_3410_5052.c
	drivers/usb/serial/ti_usb_3410_5052.h
	drivers/usb/serial/visor.c
	drivers/usb/serial/whiteheat.c
	drivers/video/msm/hdmi_msm.c
	drivers/video/msm/mdp4_overlay.c
	drivers/video/msm/mipi_dsi_host.c
	drivers/video/msm/msm_fb.c
	drivers/xen/events.c
	drivers/xen/xen-pciback/pciback_ops.c
	fs/btrfs/ioctl.c
	fs/ceph/locks.c
	fs/ceph/mds_client.c
	fs/ceph/super.c
	fs/ceph/super.h
	fs/cifs/cifs_dfs_ref.c
	fs/cifs/inode.c
	fs/exec.c
	fs/ext4/mballoc.c
	fs/fat/inode.c
	fs/hpfs/map.c
	fs/hpfs/super.c
	fs/hugetlbfs/inode.c
	fs/jfs/inode.c
	fs/jfs/jfs_logmgr.c
	fs/nfs/nfs4proc.c
	fs/nfsd/nfs4proc.c
	fs/nfsd/nfs4xdr.c
	fs/nilfs2/inode.c
	fs/notify/inotify/inotify_user.c
	fs/ocfs2/extent_map.c
	fs/ubifs/dir.c
	fs/xfs/xfs_iops.c
	include/linux/audit.h
	include/linux/ceph/auth.h
	include/linux/cpu.h
	include/linux/diagchar.h
	include/linux/ftrace.h
	include/linux/hugetlb.h
	include/linux/if_cablemodem.h
	include/linux/nl80211.h
	include/linux/perf_event.h
	include/linux/rculist.h
	include/linux/rculist_nulls.h
	include/linux/socket.h
	include/linux/swapops.h
	include/linux/wait.h
	include/linux/wcnss_wlan.h
	include/media/msm_gemini.h
	include/media/radio-iris.h
	include/net/bluetooth/hci_core.h
	include/net/bluetooth/mgmt.h
	include/net/cfg80211.h
	include/net/sock.h
	include/net/tcp.h
	include/video/msm_hdmi_modes.h
	ipc/shm.c
	kernel/cpu.c
	kernel/events/core.c
	kernel/events/hw_breakpoint.c
	kernel/events/internal.h
	kernel/kmod.c
	kernel/sys.c
	kernel/time/tick-sched.c
	kernel/trace/ftrace.c
	kernel/trace/trace_events_filter.c
	kernel/trace/trace_stack.c
	lib/klist.c
	mm/huge_memory.c
	mm/hugetlb.c
	mm/migrate.c
	mm/mmap.c
	mm/mmu_notifier.c
	mm/pagewalk.c
	mm/swap_state.c
	net/8021q/vlan_dev.c
	net/bluetooth/hci_conn.c
	net/bluetooth/hci_core.c
	net/bluetooth/hidp/core.c
	net/bluetooth/mgmt.c
	net/bridge/br_stp_timer.c
	net/ceph/auth.c
	net/ceph/auth_none.c
	net/ceph/auth_x.c
	net/ceph/auth_x.h
	net/ceph/messenger.c
	net/ceph/mon_client.c
	net/ceph/osd_client.c
	net/compat.c
	net/core/dev.c
	net/core/ethtool.c
	net/core/sock.c
	net/ipv4/ip_gre.c
	net/ipv4/ipip.c
	net/ipv4/tcp.c
	net/ipv4/tcp_input.c
	net/ipv4/tcp_output.c
	net/ipv6/addrconf.c
	net/ipv6/ip6_output.c
	net/ipv6/tcp_ipv6.c
	net/ipv6/udp.c
	net/ipv6/udp_impl.h
	net/ipv6/udplite.c
	net/ipv6/xfrm6_policy.c
	net/l2tp/l2tp_ppp.c
	net/mac80211/iface.c
	net/netlabel/netlabel_domainhash.c
	net/packet/af_packet.c
	net/sched/act_ipt.c
	net/sctp/socket.c
	net/socket.c
	net/wireless/core.c
	net/wireless/nl80211.c
	sound/pci/hda/hda_codec.c
	sound/soc/codecs/wm8994.c
	sound/usb/card.c
	sound/usb/mixer.c
	sound/usb/quirks-table.h
	tools/perf/scripts/python/net_dropmonitor.py

'Merge'