Merge branch 'net-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vxy/lksctp-dev
David S. Miller [Sun, 29 Nov 2009 08:16:22 +0000 (00:16 -0800)]

Trivial merge