Merge git://git.skbuff.net/gitroot/yoshfuji/linux-2.6.14+advapi-fix/
David S. Miller [Mon, 21 Nov 2005 04:52:16 +0000 (20:52 -0800)]
1  2 
include/net/ipv6.h
net/ipv6/raw.c
net/ipv6/udp.c

Simple merge
diff --cc net/ipv6/raw.c
Simple merge
diff --cc net/ipv6/udp.c
Simple merge