Merge git://git.skbuff.net/gitroot/yoshfuji/linux-2.6-git-rfc3542

author David S. Miller <[email protected]>

Thu, 8 Sep 2005 19:59:43 +0000 (12:59 -0700)

committer David S. Miller <[email protected]>

Thu, 8 Sep 2005 19:59:43 +0000 (12:59 -0700)
author David S. Miller <[email protected]>
Thu, 8 Sep 2005 19:59:43 +0000 (12:59 -0700)
committer David S. Miller <[email protected]>
Thu, 8 Sep 2005 19:59:43 +0000 (12:59 -0700)
diff --cc net/ipv6/exthdrs.c
Simple merge
diff --cc net/ipv6/udp.c
Simple merge
author	David S. Miller <[email protected]>
	Thu, 8 Sep 2005 19:59:43 +0000 (12:59 -0700)
committer	David S. Miller <[email protected]>
	Thu, 8 Sep 2005 19:59:43 +0000 (12:59 -0700)
		1	2
net/ipv6/exthdrs.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/ipv6/udp.c	patch \|	diff1 \|	diff2 \|	blob \| history