Merge branch 'pending' of master.kernel.org:/pub/scm/linux/kernel/git/vxy/lksctp-dev
David S. Miller [Tue, 13 Nov 2007 02:16:13 +0000 (18:16 -0800)]

Trivial merge