]> git.hungrycats.org Git - linux/commitdiff
Merge bk://kernel.bkbits.net/acme/hlist-2.5
authorDavid S. Miller <davem@nuts.ninka.net>
Mon, 16 Jun 2003 01:25:13 +0000 (18:25 -0700)
committerDavid S. Miller <davem@nuts.ninka.net>
Mon, 16 Jun 2003 01:25:13 +0000 (18:25 -0700)
into nuts.ninka.net:/home/davem/src/BK/net-2.5

1  2 
net/ipv6/udp.c

diff --cc net/ipv6/udp.c
Simple merge