Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android

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

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

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

diff --cc net/ipv4/ip_output.c
Simple merge

diff --cc net/ipv4/ping.c
Simple merge

diff --cc net/ipv6/esp6.c
Simple merge