Merge davem@master.kernel.org:/pub/scm/linux/kernel/git/vxy/lksctp-dev
authorDavid S. Miller <davem@sunset.davemloft.net>
Fri, 3 Aug 2007 02:44:43 +0000 (19:44 -0700)
committerDavid S. Miller <davem@sunset.davemloft.net>
Fri, 3 Aug 2007 02:44:43 +0000 (19:44 -0700)

Trivial merge