Merge master.kernel.org:/pub/scm/linux/kernel/git/vxy/lksctp-dev
authorDavid S. Miller <davem@sunset.davemloft.net>
Thu, 14 Jun 2007 20:06:21 +0000 (13:06 -0700)
committerDavid S. Miller <davem@sunset.davemloft.net>
Thu, 14 Jun 2007 20:06:21 +0000 (13:06 -0700)

Trivial merge