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

diff --cc fs/nfs/nfs4proc.c
Simple merge

diff --cc fs/proc/base.c
Simple merge

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

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

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

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

diff --cc net/unix/af_unix.c
Simple merge