Merge branch 'pending' of master.kernel.org:/pub/scm/linux/kernel/git/vxy/lksctp-dev
authorDavid S. Miller <davem@davemloft.net>
Sat, 9 Feb 2008 11:44:25 +0000 (03:44 -0800)
committerDavid S. Miller <davem@davemloft.net>
Sat, 9 Feb 2008 11:44:25 +0000 (03:44 -0800)

Trivial merge