]> git.neil.brown.name Git - history.git/commitdiff
Merge bk://kernel.bkbits.net/acme/net_family-2.5
authorDavid S. Miller <davem@nuts.ninka.net>
Fri, 2 May 2003 18:13:39 +0000 (11:13 -0700)
committerDavid S. Miller <davem@nuts.ninka.net>
Fri, 2 May 2003 18:13:39 +0000 (11:13 -0700)
into nuts.ninka.net:/home/davem/src/BK/net-2.5

1  2 
net/ipv6/tcp_ipv6.c

Simple merge