Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@kernel.org>
Wed, 15 Oct 2014 08:53:02 +0000 (10:53 +0200)
committerMark Brown <broonie@kernel.org>
Wed, 15 Oct 2014 08:53:02 +0000 (10:53 +0200)
commit37a64bbfe358d7673f80dfb0d0851567638f7e54
tree8954649e4792ec5088242a5d4a573101aa34581e
parent1ebc0d9dae292e97a969699be7d74b0b71603977
parent160682022493dc6326ef268225949f2cee6231e2
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
include/net/tcp.h
net/ipv4/tcp_ipv4.c
net/ipv4/tcp_output.c
net/ipv6/addrconf.c
net/ipv6/tcp_ipv6.c