]> git.hungrycats.org Git - linux/commit
Merge touki.austin.ibm.com:/home/jgrimm/bk/linux-2.5.66
authorJon Grimm <jgrimm@touki.austin.ibm.com>
Tue, 25 Mar 2003 04:06:13 +0000 (22:06 -0600)
committerJon Grimm <jgrimm@touki.austin.ibm.com>
Tue, 25 Mar 2003 04:06:13 +0000 (22:06 -0600)
commit9850a96f26ed8491c4524158c0febd6224532f53
tree107210eaace252eaacebe00a07035eb8e195e8f2
parent42382f86038cbfaa2fb37b61aba42cd6c40f6267
parenta33b43999f950d56dba711d914bff965ebd1394e
Merge touki.austin.ibm.com:/home/jgrimm/bk/linux-2.5.66
into touki.austin.ibm.com:/home/jgrimm/bk/lksctp-2.5.work
net/sctp/input.c
net/sctp/ipv6.c