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

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

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

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