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)
commit47cf66ff098ac408194713be6531a7bb57d1b99b
tree6711205bc3d5f6200adea4ba2173f2d1d9b0c063
parent66cadb7bd46c6691eea6f671380405ab03b423ad
parent7c9373fbcd0b29f6ccc28407c11ecd51cfa7a3c2
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
include/net/tcp.h
net/ipv4/tcp.c
net/unix/af_unix.c