Merge branch 'android-3.10' into dev-kernel-3.10
authorSumit Singh <sumsingh@nvidia.com>
Mon, 29 Sep 2014 11:02:38 +0000 (16:02 +0530)
committerSumit Singh <sumsingh@nvidia.com>
Fri, 10 Oct 2014 13:55:26 +0000 (18:55 +0530)
commit9e4d0ce1d5c4bbc787e446dc7aadd6030b960a4f
tree0a938ed1899970bbd5834f871d2781402fa5c5c1
parent2ca6669c6620eb568b5917df423d467f97170722
parent88835a3a4ea3b5107c3ea79ee1169aac5fadf808
Merge branch 'android-3.10' into dev-kernel-3.10

Conflicts:
arch/arm64/Kconfig
arch/arm64/include/asm/cputype.h
arch/arm64/include/asm/debug-monitors.h
arch/arm64/include/asm/elf.h
arch/arm64/include/asm/hwcap.h
arch/arm64/kernel/Makefile
arch/arm64/kernel/debug-monitors.c
arch/arm64/kernel/entry.S
arch/arm64/kernel/hw_breakpoint.c
arch/arm64/kernel/kuser32.S
arch/arm64/kernel/ptrace.c
arch/arm64/kernel/setup.c
arch/arm64/mm/proc.S
drivers/usb/gadget/f_rndis.c
drivers/usb/gadget/u_ether.c

Bug 200041789

Change-Id: I7368875b5404fdda72510e22e562138e544a03f9
Signed-off-by: Sumit Singh <sumsingh@nvidia.com>
23 files changed:
MAINTAINERS
arch/Kconfig
arch/arm/Kconfig
arch/arm64/Kconfig
arch/arm64/include/asm/compat.h
arch/arm64/include/asm/ptrace.h
arch/arm64/include/asm/syscall.h
arch/arm64/include/asm/thread_info.h
arch/arm64/kernel/entry.S
arch/arm64/kernel/hw_breakpoint.c
arch/arm64/kernel/kuser32.S
arch/arm64/kernel/process.c
arch/arm64/kernel/ptrace.c
arch/arm64/kernel/setup.c
arch/arm64/kernel/signal32.c
arch/arm64/kernel/sys_compat.c
drivers/usb/gadget/f_rndis.c
drivers/usb/gadget/u_ether.c
drivers/usb/gadget/u_ether.h
fs/exec.c
include/linux/syscalls.h
include/uapi/linux/audit.h
kernel/fork.c