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

diff --cc arch/arm64/Kconfig
Simple merge

diff --cc arch/arm64/Makefile
Simple merge

diff --cc arch/arm64/include/asm/thread_info.h
Simple merge

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

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

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

diff --cc arch/arm64/mm/init.c
Simple merge

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