Merge branch 'android-3.10' into dev-kernel-3.10
authorSumit Singh <sumsingh@nvidia.com>
Tue, 28 Oct 2014 09:28:05 +0000 (14:28 +0530)
committerSumit Singh <sumsingh@nvidia.com>
Tue, 28 Oct 2014 09:57:08 +0000 (14:57 +0530)
commit178e3fae29fd39a93fa067f20c4e1a53615d9818
treea5815ec1b8ea13d889019ae0f7ed5980d385d2bd
parent433da7a15de04b69e2720066f03017b628cffe2c
parent13224a7d4e4e4ac6ade52deec32e9f9c28533659
Merge branch 'android-3.10' into dev-kernel-3.10

Bug 200050187

Conflicts:
arch/arm64/kernel/entry.S

Change-Id: I1a7399a778a7962b56942595829a4807aa2d3a58
Signed-off-by: Sumit Singh <sumsingh@nvidia.com>
14 files changed:
arch/Kconfig
arch/arm/include/asm/syscall.h
arch/arm64/Kconfig
arch/arm64/include/asm/compat.h
arch/arm64/include/asm/ptrace.h
arch/arm64/kernel/entry.S
arch/arm64/kernel/ptrace.c
arch/arm64/kernel/signal32.c
drivers/cpufreq/cpufreq_stats.c
fs/exec.c
include/linux/sched.h
include/linux/syscalls.h
kernel/fork.c
kernel/power/process.c