]> git.hungrycats.org Git - linux/commitdiff
Merge nuts.davemloft.net:/disk1/BK/acme-2.6
authorDavid S. Miller <davem@nuts.davemloft.net>
Wed, 29 Sep 2004 06:35:18 +0000 (23:35 -0700)
committerDavid S. Miller <davem@nuts.davemloft.net>
Wed, 29 Sep 2004 06:35:18 +0000 (23:35 -0700)
into nuts.davemloft.net:/disk1/BK/net-2.6

1  2 
net/ipv6/tcp_ipv6.c

Simple merge