Merge branch 'net-2.6.26-isatap-20080403' of git://git.linux-ipv6.org/gitroot/yoshfuj...

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

Tue, 8 Apr 2008 09:33:36 +0000 (02:33 -0700)

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

Tue, 8 Apr 2008 09:33:36 +0000 (02:33 -0700)
author David S. Miller <davem@davemloft.net>
Tue, 8 Apr 2008 09:33:36 +0000 (02:33 -0700)
committer David S. Miller <davem@davemloft.net>
Tue, 8 Apr 2008 09:33:36 +0000 (02:33 -0700)
diff --cc net/ipv6/Kconfig
Simple merge
diff --cc net/ipv6/addrconf.c
Simple merge
diff --cc net/ipv6/ndisc.c
Simple merge
diff --cc net/ipv6/route.c
Simple merge
author	David S. Miller <davem@davemloft.net>
	Tue, 8 Apr 2008 09:33:36 +0000 (02:33 -0700)
committer	David S. Miller <davem@davemloft.net>
	Tue, 8 Apr 2008 09:33:36 +0000 (02:33 -0700)
		1	2
net/ipv6/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
net/ipv6/addrconf.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/ipv6/ndisc.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/ipv6/route.c	patch \|	diff1 \|	diff2 \|	blob \| history