Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

Conflicts:
	arch/arm64/include/asm/processor.h

diff --cc arch/arm64/Kconfig
index 4ff74ee25d6185675fb425759b8cdfbd7b659c2e,d64c1a0e9dd0e5a0d25c832f62ffd8811fd95359..a1d9fc5ce726adf81da2e525ff01376368ae82bf
--- 1/arch/arm64/Kconfig
--- 2/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@@ -32,10 -32,9 +33,11 @@@ config ARM6
        select HARDIRQS_SW_RESEND
        select HAVE_ARCH_JUMP_LABEL
        select HAVE_ARCH_KGDB
 +      select HAVE_ARCH_AUDITSYSCALL
 +      select HAVE_ARCH_SECCOMP_FILTER
        select HAVE_ARCH_TRACEHOOK
        select HAVE_C_RECORDMCOUNT
+       select HAVE_CC_STACKPROTECTOR
        select HAVE_DEBUG_BUGVERBOSE
        select HAVE_DEBUG_KMEMLEAK
        select HAVE_DMA_API_DEBUG

diff --cc arch/arm64/kernel/Makefile
Simple merge

diff --cc arch/arm64/kernel/process.c
Simple merge

diff --cc arch/arm64/kernel/ptrace.c
Simple merge

diff --cc arch/arm64/mm/proc.S
Simple merge