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)
commitcf9e50a920be24b734fb91f19b8844f8509cb981
treea077c31bcfe9844bcfa7ff1fe07364b5b7958622
parent0f36b018b2e314d45af86449f1a97facb1fbe300
parenta7d1f1b66c05ef4ebb58a34be7caad9af15546a4
Merge /pub/scm/linux/kernel/git/sridhar/lksctp-2.6