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)

Trivial merge