Merge branch 'linux-3.10.59' into dev-kernel-3.10
authorIshan Mittal <imittal@nvidia.com>
Mon, 17 Nov 2014 09:11:55 +0000 (14:11 +0530)
committerIshan Mittal <imittal@nvidia.com>
Mon, 17 Nov 2014 09:20:05 +0000 (14:20 +0530)
commit6fda1ee1634ee98a147599d91f8bfb148ad6498e
treeab9ef2dbef930e1370fecd57e6aec4d0f523bc32
parenta1247f755b4e199bf0755a8849ee5631e28aef36
parent816b571ac0e9eb9700df1ebc99702f9ad04e8607
Merge branch 'linux-3.10.59' into dev-kernel-3.10

Bug 200023519

Conflicts:
        arch/arm/kernel/entry-common.S
        arch/arm64/Kconfig
        drivers/cpufreq/cpufreq_ondemand.c
        drivers/usb/core/hub.c
        kernel/fork.c
        net/wireless/nl80211.c
        sound/soc/codecs/max98090.c

Change-Id: I45bfefe48d0ae23c7a989c79e889213c18ca8ff7
Signed-off-by: Ishan Mittal <imittal@nvidia.com>
73 files changed:
Makefile
arch/arm/Kconfig
arch/arm/kernel/entry-common.S
arch/arm/mm/idmap.c
arch/arm64/Kconfig
arch/arm64/include/asm/compat.h
arch/arm64/kernel/process.c
arch/arm64/kernel/ptrace.c
arch/arm64/kernel/sys_compat.c
arch/powerpc/Kconfig
arch/sparc/Kconfig
arch/sparc/mm/fault_64.c
arch/x86/Kconfig
block/genhd.c
block/partition-generic.c
drivers/base/firmware_class.c
drivers/base/regmap/regmap.c
drivers/cpufreq/cpufreq_ondemand.c
drivers/cpufreq/cpufreq_stats.c
drivers/hid/hid-magicmouse.c
drivers/iio/inkern.c
drivers/input/input.c
drivers/irqchip/irq-gic.c
drivers/net/ethernet/intel/igb/igb_main.c
drivers/pci/quirks.c
drivers/tty/serial/serial_core.c
drivers/usb/core/hub.c
drivers/usb/dwc3/dwc3-omap.c
drivers/usb/host/ehci-hcd.c
drivers/usb/host/xhci-hub.c
drivers/usb/host/xhci-ring.c
drivers/usb/host/xhci.c
fs/buffer.c
fs/ext4/mballoc.c
fs/nfs/nfs4proc.c
include/linux/sched.h
include/net/ip.h
include/net/ipv6.h
include/net/sock.h
include/net/tcp.h
init/Kconfig
init/main.c
kernel/fork.c
kernel/power/power.h
kernel/power/process.c
kernel/power/suspend.c
kernel/printk.c
kernel/sched/core.c
kernel/sched/debug.c
kernel/sched/rt.c
kernel/smp.c
kernel/time/alarmtimer.c
kernel/trace/trace.c
mm/oom_kill.c
mm/page_alloc.c
mm/shmem.c
mm/util.c
net/bluetooth/l2cap_sock.c
net/bluetooth/rfcomm/core.c
net/bluetooth/sco.c
net/ipv4/icmp.c
net/ipv4/ip_output.c
net/ipv4/raw.c
net/ipv4/route.c
net/ipv4/tcp.c
net/ipv4/tcp_input.c
net/ipv4/tcp_ipv4.c
net/ipv4/tcp_output.c
net/ipv6/addrconf.c
net/ipv6/tcp_ipv6.c
net/netlink/af_netlink.c
security/commoncap.c
sound/soc/soc-pcm.c