Merge branch 'net-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vxy/lksctp-dev
authorDavid S. Miller <davem@davemloft.net>
Mon, 3 May 2010 23:20:44 +0000 (16:20 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 3 May 2010 23:24:31 +0000 (16:24 -0700)
commitf5460618405eec8c3300947a499011528a115acd
tree19aba5acb6d91d5a20400292aaf1881a6b26c118
parent4f70ecca9c57731b4acbe5043eb22e4416bd2368
parent0e3aef8d09a8c11e3fb83cdcb24b5bc7421b3726
Merge branch 'net-next' of git://git./linux/kernel/git/vxy/lksctp-dev

Add missing linux/vmalloc.h include to net/sctp/probe.c

Signed-off-by: David S. Miller <davem@davemloft.net>
include/net/sctp/sctp.h
include/net/sctp/structs.h
net/sctp/associola.c
net/sctp/endpointola.c
net/sctp/probe.c
net/sctp/sm_make_chunk.c
net/sctp/sm_sideeffect.c
net/sctp/socket.c