Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/vxy/lksctp-dev
David S. Miller [Fri, 31 Aug 2007 05:11:31 +0000 (22:11 -0700)]

Trivial merge