Merge git://git.skbuff.net/gitroot/yoshfuji/linux-2.6.14+advapi-fix/

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

Mon, 21 Nov 2005 04:52:16 +0000 (20:52 -0800)

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

Mon, 21 Nov 2005 04:52:16 +0000 (20:52 -0800)
author David S. Miller <davem@sunset.davemloft.net>
Mon, 21 Nov 2005 04:52:16 +0000 (20:52 -0800)
committer David S. Miller <davem@sunset.davemloft.net>
Mon, 21 Nov 2005 04:52:16 +0000 (20:52 -0800)
diff --cc include/net/ipv6.h
Simple merge
diff --cc net/ipv6/raw.c
Simple merge
diff --cc net/ipv6/udp.c
Simple merge
author	David S. Miller <davem@sunset.davemloft.net>
	Mon, 21 Nov 2005 04:52:16 +0000 (20:52 -0800)
committer	David S. Miller <davem@sunset.davemloft.net>
	Mon, 21 Nov 2005 04:52:16 +0000 (20:52 -0800)
		1	2
include/net/ipv6.h	patch \|	diff1 \|	diff2 \|	blob \| history
net/ipv6/raw.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/ipv6/udp.c	patch \|	diff1 \|	diff2 \|	blob \| history