Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorAlex Shi <alex.shi@linaro.org>
Fri, 28 Mar 2014 03:07:37 +0000 (11:07 +0800)
committerAlex Shi <alex.shi@linaro.org>
Fri, 28 Mar 2014 03:07:37 +0000 (11:07 +0800)
commit696e897344f58397b3d463fbb9f9a2f317d720c0
tree8e1ebb350e82244b8243d4b5e0cc5cc4184fea13
parent943550a24c51bdd971f579200f286241548deaf7
parent02e11cd17332186b4cf9ed88db6e63b30043be54
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
fs/nfs/nfs4proc.c
fs/proc/base.c
include/net/tcp.h
net/ipv4/tcp.c
net/ipv4/tcp_output.c
net/ipv6/exthdrs_core.c
net/unix/af_unix.c