Merge master.kernel.org:/pub/scm/linux/kernel/git/sridhar/lksctp-2.6
authorArnaldo Carvalho de Melo <acme@mandriva.com>
Sat, 29 Oct 2005 01:35:02 +0000 (23:35 -0200)
committerArnaldo Carvalho de Melo <acme@mandriva.com>
Sat, 29 Oct 2005 01:35:02 +0000 (23:35 -0200)
commit974f7bc5781d3fc16e32d8908c6e48592e767dd2
treead36a9c4d93a138fbcd02c1df9fa3a3a321e0cc2
parent89fbb69c4f285019ba5e029963dc11cc6beb078a
parent64a0c1c81e300f0f56f26604c81040784e3717f0
Merge /pub/scm/linux/kernel/git/sridhar/lksctp-2.6