]> git.hungrycats.org Git - linux/commitdiff
projects / linux / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 774bf41 eb0a397)
Merge http://linux-lksctp.bkbits.net/lksctp-2.5.work
authorDavid S. Miller <davem@nuts.davemloft.net>
Fri, 6 Feb 2004 11:38:04 +0000 (03:38 -0800)
committerDavid S. Miller <davem@nuts.davemloft.net>
Fri, 6 Feb 2004 11:38:04 +0000 (03:38 -0800)
into nuts.davemloft.net:/disk1/BK/net-2.6

1  2 
include/linux/sysctl.h patch | diff1 | diff2 | blob | history
include/net/sctp/structs.h patch | diff1 | diff2 | blob | history

diff --cc include/linux/sysctl.h
Simple merge
diff --cc include/net/sctp/structs.h
Simple merge
Linux kernels and configurations used by Zygo.