Merge nuts.ninka.net:/home/davem/src/BK/BAK-net-2.5

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

Thu, 1 Aug 2002 12:11:49 +0000 (05:11 -0700)

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

Thu, 1 Aug 2002 12:11:49 +0000 (05:11 -0700)
author David S. Miller <davem@nuts.ninka.net>
Thu, 1 Aug 2002 12:11:49 +0000 (05:11 -0700)
committer David S. Miller <davem@nuts.ninka.net>
Thu, 1 Aug 2002 12:11:49 +0000 (05:11 -0700)
diff --cc CREDITS
Simple merge
diff --cc net/ipv4/ipconfig.c
Simple merge
diff --cc net/netlink/netlink_dev.c
Simple merge
author	David S. Miller <davem@nuts.ninka.net>
	Thu, 1 Aug 2002 12:11:49 +0000 (05:11 -0700)
committer	David S. Miller <davem@nuts.ninka.net>
	Thu, 1 Aug 2002 12:11:49 +0000 (05:11 -0700)
		1	2
CREDITS	patch \|	diff1 \|	diff2 \|	blob \| history
net/ipv4/ipconfig.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/netlink/netlink_dev.c	patch \|	diff1 \|	diff2 \|	blob \| history