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

diff --cc fs/ext4/ioctl.c
Simple merge

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

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

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

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