Merge branch 'net-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vxy/lksctp-dev
authorDavid S. Miller <davem@davemloft.net>
Thu, 4 Jun 2009 04:43:52 +0000 (21:43 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 4 Jun 2009 04:43:52 +0000 (21:43 -0700)

Trivial merge