Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

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

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

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

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

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