]> git.hungrycats.org Git - linux/commitdiff
Merge dyn9-47-18-140.beaverton.ibm.com:/home/sridhar/BK/sctp-2.5
authorSridhar Samudrala <sridhar@dyn9-47-18-140.beaverton.ibm.com>
Fri, 18 Oct 2002 02:40:07 +0000 (19:40 -0700)
committerSridhar Samudrala <sridhar@dyn9-47-18-140.beaverton.ibm.com>
Fri, 18 Oct 2002 02:40:07 +0000 (19:40 -0700)
into dyn9-47-18-140.beaverton.ibm.com:/home/sridhar/BK/lksctp-2.5

1  2 
net/sctp/outqueue.c

Simple merge