]> git.hungrycats.org Git - linux/commitdiff
projects / linux / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6781fde e343efc)
Merge http://linux-lksctp.bkbits.net/lksctp-2.5.work
authorDavid S. Miller <davem@nuts.davemloft.net>
Fri, 4 Jun 2004 07:02:33 +0000 (00:02 -0700)
committerDavid S. Miller <davem@nuts.davemloft.net>
Fri, 4 Jun 2004 07:02:33 +0000 (00:02 -0700)
into nuts.davemloft.net:/disk1/BK/net-2.6

1  2 
net/sctp/socket.c patch | diff1 | diff2 | blob | history

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