Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Tue, 5 Nov 2013 20:06:43 +0000 (20:06 +0000)
committerMark Brown <broonie@linaro.org>
Tue, 5 Nov 2013 20:06:43 +0000 (20:06 +0000)
1  2 
include/net/tcp.h
net/ipv4/tcp.c
net/unix/af_unix.c

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