Merge bk://kernel.bkbits.net/acme/net-2.6

author David S. Miller <davem@nuts.davemloft.net>

Sun, 3 Oct 2004 07:26:22 +0000 (00:26 -0700)

committer David S. Miller <davem@nuts.davemloft.net>

Sun, 3 Oct 2004 07:26:22 +0000 (00:26 -0700)
author David S. Miller <davem@nuts.davemloft.net>
Sun, 3 Oct 2004 07:26:22 +0000 (00:26 -0700)
committer David S. Miller <davem@nuts.davemloft.net>
Sun, 3 Oct 2004 07:26:22 +0000 (00:26 -0700)
diff --cc net/ipv4/tcp.c
Simple merge
diff --cc net/ipv4/tcp_diag.c
Simple merge
author	David S. Miller <davem@nuts.davemloft.net>
	Sun, 3 Oct 2004 07:26:22 +0000 (00:26 -0700)
committer	David S. Miller <davem@nuts.davemloft.net>
	Sun, 3 Oct 2004 07:26:22 +0000 (00:26 -0700)
		1	2
net/ipv4/tcp.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_diag.c	patch \|	diff1 \|	diff2 \|	blob \| history