Merge master.kernel.org:/home/acme/BK/net-2.5

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

Sun, 20 Oct 2002 14:42:43 +0000 (07:42 -0700)

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

Sun, 20 Oct 2002 14:42:43 +0000 (07:42 -0700)
author David S. Miller <davem@nuts.ninka.net>
Sun, 20 Oct 2002 14:42:43 +0000 (07:42 -0700)
committer David S. Miller <davem@nuts.ninka.net>
Sun, 20 Oct 2002 14:42:43 +0000 (07:42 -0700)
diff --cc net/ipv4/af_inet.c
Simple merge
diff --cc net/ipv4/udp.c
Simple merge
author	David S. Miller <davem@nuts.ninka.net>
	Sun, 20 Oct 2002 14:42:43 +0000 (07:42 -0700)
committer	David S. Miller <davem@nuts.ninka.net>
	Sun, 20 Oct 2002 14:42:43 +0000 (07:42 -0700)
		1	2
net/ipv4/af_inet.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/ipv4/udp.c	patch \|	diff1 \|	diff2 \|	blob \| history