Merge branch 'net-2.6.26-isatap-20080403' of git://git.linux-ipv6.org/gitroot/yoshfuj...
David S. Miller [Tue, 8 Apr 2008 09:33:36 +0000 (02:33 -0700)]
1  2 
net/ipv6/Kconfig
net/ipv6/addrconf.c
net/ipv6/ndisc.c
net/ipv6/route.c

Simple merge
Simple merge
Simple merge
Simple merge