Merge branch 'pending' of master.kernel.org:/pub/scm/linux/kernel/git/vxy/lksctp-dev
authorDavid S. Miller <davem@davemloft.net>
Thu, 28 Feb 2008 21:56:37 +0000 (13:56 -0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 28 Feb 2008 21:56:37 +0000 (13:56 -0800)

Trivial merge