Merge remote-tracking branch 'origin/dev/sumit-linux-3.10.96' into TOT-merge
authorSumit Singh <sumsingh@nvidia.com>
Tue, 1 Mar 2016 09:05:34 +0000 (14:05 +0530)
committerSumit Singh <sumsingh@nvidia.com>
Tue, 1 Mar 2016 09:05:34 +0000 (14:05 +0530)
commit057b2f96fabb71fd2579f8e273e9023d75368c6f
treefe6ace787c70e47fe69c435225edf1c9e3e05ac4
parentd0fc45a251761cf4a40a8f92a2123298c3f4ea63
parentb479738cf71d4217f2a175f80546ddf602385864
Merge remote-tracking branch 'origin/dev/sumit-linux-3.10.96' into TOT-merge

Conflicts:
arch/arm/include/asm/memory.h
arch/arm/kernel/module.c
arch/arm/mm/dma-mapping.c
arch/arm/mm/mmu.c
arch/arm64/kernel/setup.c
arch/arm64/kernel/time.c
arch/arm64/mm/mmu.c
drivers/mmc/core/core.c
drivers/regulator/core.c
drivers/usb/class/cdc-acm.c
drivers/video/console/Kconfig
fs/exec.c
fs/proc/task_mmu.c
fs/pstore/ram.c
include/linux/usb/quirks.h
kernel/power/qos.c
net/bluetooth/sco.c

Change-Id: I49c5d0d88a85f6fd120f01db7170744cf91459d5
Signed-off-by: Sumit Singh <sumsingh@nvidia.com>
168 files changed:
Makefile
arch/arc/kernel/signal.c
arch/arm/Makefile
arch/arm/include/asm/atomic.h
arch/arm/include/asm/elf.h
arch/arm/include/asm/memory.h
arch/arm/include/asm/pgtable-3level-hwdef.h
arch/arm/include/asm/pgtable-3level.h
arch/arm/include/asm/pgtable.h
arch/arm/kernel/entry-armv.S
arch/arm/kernel/entry-common.S
arch/arm/kernel/fiq.c
arch/arm/kernel/module.c
arch/arm/mach-dove/common.c
arch/arm/mach-kirkwood/common.c
arch/arm/mach-mv78xx0/common.c
arch/arm/mach-orion5x/common.c
arch/arm/mach-pxa/corgi.c
arch/arm/mach-pxa/poodle.c
arch/arm/mm/dma-mapping.c
arch/arm/mm/proc-v7-3level.S
arch/arm64/Kconfig
arch/arm64/include/asm/cputype.h
arch/arm64/include/asm/ptrace.h
arch/arm64/kernel/head.S
arch/arm64/kernel/ptrace.c
arch/arm64/kernel/setup.c
arch/arm64/kernel/signal32.c
arch/arm64/kernel/smp.c
arch/arm64/kernel/stacktrace.c
arch/arm64/kernel/vdso/Makefile
arch/arm64/mm/fault.c
arch/arm64/mm/init.c
arch/arm64/mm/mmap.c
arch/arm64/mm/mmu.c
arch/mips/kernel/signal32.c
arch/mn10300/Kconfig
arch/powerpc/kernel/signal_32.c
arch/x86/Kconfig
arch/x86/kernel/reboot.c
arch/x86/kernel/signal.c
arch/x86/pci/acpi.c
block/genhd.c
drivers/ata/libata-eh.c
drivers/base/devres.c
drivers/base/firmware_class.c
drivers/base/platform.c
drivers/base/regmap/regmap.c
drivers/cpufreq/speedstep-smi.c
drivers/cpuidle/cpuidle.c
drivers/cpuidle/governors/menu.c
drivers/gpio/gpiolib.c
drivers/hid/hid-core.c
drivers/hid/hid-input.c
drivers/hid/i2c-hid/i2c-hid.c
drivers/hid/usbhid/hid-core.c
drivers/i2c/i2c-core.c
drivers/media/rc/rc-main.c
drivers/mmc/card/block.c
drivers/mmc/card/queue.c
drivers/mmc/card/queue.h
drivers/mmc/core/core.c
drivers/mtd/mtd_blkdevs.c
drivers/net/ethernet/realtek/r8169.c
drivers/net/usb/usbnet.c
drivers/of/address.c
drivers/pci/pci-driver.c
drivers/pci/quirks.c
drivers/pinctrl/core.c
drivers/pinctrl/core.h
drivers/regulator/core.c
drivers/scsi/hpsa.c
drivers/scsi/scsi_error.c
drivers/spi/spi.c
drivers/spi/spidev.c
drivers/staging/ozwpan/ozusbsvc1.c
drivers/tty/serial/of_serial.c
drivers/tty/tty_io.c
drivers/tty/vt/vt.c
drivers/usb/class/cdc-acm.c
drivers/usb/core/hub.c
drivers/usb/core/quirks.c
drivers/usb/host/xhci-hub.c
drivers/usb/host/xhci-ring.c
drivers/usb/host/xhci.c
drivers/usb/host/xhci.h
drivers/usb/phy/phy.c
drivers/xen/gntdev.c
fs/binfmt_elf.c
fs/btrfs/super.c
fs/debugfs/inode.c
fs/exec.c
fs/exportfs/expfs.c
fs/ext4/extents.c
fs/ext4/mballoc.c
fs/ext4/super.c
fs/fuse/dev.c
fs/fuse/inode.c
fs/hpfs/super.c
fs/inode.c
fs/nfs/inode.c
fs/nfs/nfs4proc.c
fs/proc/task_mmu.c
fs/pstore/inode.c
include/linux/fs.h
include/linux/iio/iio.h
include/linux/interrupt.h
include/linux/kernel.h
include/linux/mm.h
include/linux/sched.h
include/linux/security.h
include/linux/syscalls.h
include/linux/usb.h
include/linux/usb/hcd.h
include/linux/usb/quirks.h
include/net/ip.h
include/net/ipv6.h
include/net/netns/ipv4.h
include/net/sock.h
kernel/cgroup.c
kernel/fork.c
kernel/module.c
kernel/power/qos.c
kernel/printk.c
kernel/ptrace.c
kernel/signal.c
kernel/smpboot.c
kernel/trace/trace.c
kernel/trace/trace.h
kernel/trace/trace_events.c
mm/compaction.c
mm/filemap.c
mm/hugetlb.c
mm/ksm.c
mm/memory.c
mm/mmap.c
mm/vmscan.c
net/bluetooth/sco.c
net/core/fib_rules.c
net/core/sock.c
net/ipv4/af_inet.c
net/ipv4/ip_output.c
net/ipv4/ip_sockglue.c
net/ipv4/ipmr.c
net/ipv4/ping.c
net/ipv4/route.c
net/ipv4/tcp_input.c
net/ipv4/tcp_ipv4.c
net/ipv4/tcp_output.c
net/ipv4/udp.c
net/ipv6/af_inet6.c
net/ipv6/datagram.c
net/ipv6/ip6mr.c
net/ipv6/route.c
net/ipv6/tcp_ipv6.c
net/ipv6/udp.c
net/mac80211/ieee80211_i.h
net/netlink/af_netlink.c
net/phonet/af_phonet.c
net/socket.c
net/unix/af_unix.c
net/wireless/nl80211.c
scripts/recordmcount.pl
sound/pci/hda/hda_codec.c
sound/pci/hda/hda_intel.c
sound/soc/codecs/wm8903.c
sound/soc/soc-compress.c
virt/kvm/kvm_main.c