]> git.neil.brown.name Git - history.git/commitdiff
projects / history.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f3e971e 4a54213)
Merge http://linux-lksctp.bkbits.net/lksctp-2.5
authorDavid S. Miller <davem@nuts.ninka.net>
Thu, 4 Sep 2003 19:56:30 +0000 (12:56 -0700)
committerDavid S. Miller <davem@nuts.ninka.net>
Thu, 4 Sep 2003 19:56:30 +0000 (12:56 -0700)
into nuts.ninka.net:/disk1/davem/BK/net-2.5

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

diff --cc net/sctp/socket.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.