]> git.hungrycats.org Git - linux/commitdiff
Merge us.ibm.com:/home/sridhar/BK/lksctp-2.5.work
authorSridhar Samudrala <sri@us.ibm.com>
Mon, 24 Nov 2003 02:29:26 +0000 (18:29 -0800)
committerSridhar Samudrala <sri@us.ibm.com>
Mon, 24 Nov 2003 02:29:26 +0000 (18:29 -0800)
into us.ibm.com:/home/sridhar/BK/lksctp-2.6.0-test10

1  2 
include/linux/sysctl.h

Simple merge