Merge git://git.skbuff.net/gitroot/yoshfuji/linux-2.6.14+git+ipv6-fix-20051221a
authorDavid S. Miller <davem@sunset.davemloft.net>
Thu, 22 Dec 2005 15:41:27 +0000 (07:41 -0800)
committerDavid S. Miller <davem@sunset.davemloft.net>
Thu, 22 Dec 2005 15:41:27 +0000 (07:41 -0800)
1  2 
net/ipv6/addrconf.c

Simple merge