Merge branch 'pending' of master.kernel.org:/pub/scm/linux/kernel/git/vxy/lksctp-dev
authorDavid S. Miller <davem@sunset.davemloft.net>
Tue, 13 Nov 2007 02:16:13 +0000 (18:16 -0800)
committerDavid S. Miller <davem@sunset.davemloft.net>
Tue, 13 Nov 2007 02:16:13 +0000 (18:16 -0800)

Trivial merge