]> git.hungrycats.org Git - linux/commitdiff
projects / linux / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c6e97af 1db8a26)
Merge bk://bk.skbuff.net:20607/linux-2.6-ipstats
authorDavid S. Miller <davem@nuts.davemloft.net>
Tue, 1 Jun 2004 14:58:12 +0000 (07:58 -0700)
committerDavid S. Miller <davem@nuts.davemloft.net>
Tue, 1 Jun 2004 14:58:12 +0000 (07:58 -0700)
into nuts.davemloft.net:/disk1/BK/net-2.6

1  2 
net/ipv6/route.c patch | diff1 | diff2 | blob | history

diff --cc net/ipv6/route.c
Simple merge
Linux kernels and configurations used by Zygo.