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

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

diff --cc drivers/net/tun.c
Simple merge

diff --cc fs/fuse/dev.c
Simple merge

diff --cc kernel/printk/printk.c
Simple merge

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

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

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

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

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

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

diff --cc net/l2tp/l2tp_ip6.c
Simple merge