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

diff --cc Makefile
Simple merge

diff --cc block/partition-generic.c
Simple merge

diff --cc drivers/md/dm-ioctl.c
Simple merge

diff --cc fs/ext4/ext4.h
Simple merge

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

diff --cc include/net/addrconf.h
Simple merge

diff --cc include/net/ip6_route.h
Simple merge

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

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

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

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

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