Merge branch 'net-2.6.26-isatap-20080403' of git://git.linux-ipv6.org/gitroot/yoshfuj...
authorDavid S. Miller <davem@davemloft.net>
Tue, 8 Apr 2008 09:33:36 +0000 (02:33 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 8 Apr 2008 09:33:36 +0000 (02:33 -0700)
commit8eefca4888c986d993b2571eb31f0397a5d0a178
treeadc659aba0eaaaaa3d33db20d7c759dfc5f0669b
parent549e028d012fab01e5726943d4afecd0c33d64e6
parentde357cc01334a468e4d5b7ba66a17b0d3ca9d63e
Merge branch 'net-2.6.26-isatap-20080403' of git://git.linux-ipv6.org/gitroot/yoshfuji/linux-2.6-dev
net/ipv6/Kconfig
net/ipv6/addrconf.c
net/ipv6/ndisc.c
net/ipv6/route.c