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)
commite6469297d4eecfd9f46929fe1f56a01141cb0791
tree9cdd368a9c5e02c177e54edcfd8bcc06155526a9
parent9b78a82c1cf19aa813bdaa184fa840a3ba811750
parent6b3ae80a63e47f6e97d68a1ddd520e3509e62821
Merge git://git.skbuff.net/gitroot/yoshfuji/linux-2.6.14+git+ipv6-fix-20051221a
net/ipv6/addrconf.c