Merge master.kernel.org:/pub/scm/linux/kernel/git/sridhar/lksctp-2.6
authorDavid S. Miller <davem@sunset.davemloft.net>
Fri, 20 Jan 2006 00:53:02 +0000 (16:53 -0800)
committerDavid S. Miller <davem@sunset.davemloft.net>
Fri, 20 Jan 2006 00:53:02 +0000 (16:53 -0800)

Trivial merge
This page took 0.033357 seconds and 5 git commands to generate.