Merge branch 'net-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vxy/lksctp-dev
commit5656b6ca19c602a7074effae360e5a4dcfdc8170
authorDavid S. Miller <davem@davemloft.net>
Sun, 29 Nov 2009 08:16:22 +0000 (29 00:16 -0800)
committerDavid S. Miller <davem@davemloft.net>
Sun, 29 Nov 2009 08:16:22 +0000 (29 00:16 -0800)
tree13eb8138999a3c6a8e6f92fb98b0cc54b7240c6a
parentc1ac403bfa240617da2bce861ea5c3a907a65612
parent4814326b59db0cfd18ac652626d955ad3f57fb0f
Merge branch 'net-next' of git://git./linux/kernel/git/vxy/lksctp-dev