Merge tag 'v4.4.46' into linux-linaro-lsk-v4.4

 This is the 4.4.46 stable release

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

diff --cc arch/arm64/kernel/entry.S
Simple merge

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

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