David S. Miller a2bfbc072e Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/can/Kconfig		2009-11-17 00:05:02 -08:00
..
associola.c	sctp: Set source addresses on the association before adding transports	2009-11-13 19:56:50 -08:00
auth.c
bind_addr.c
chunk.c
command.c
debug.c
endpointola.c
input.c
inqueue.c
ipv6.c	sctp: ipv6: avoid touching device refcount	2009-11-05 22:34:21 -08:00
Kconfig
Makefile
objcnt.c
output.c	sctp: remove dup code in net/sctp/output.c	2009-09-04 18:21:02 -04:00
outqueue.c
primitive.c
proc.c
protocol.c	net: drop capability from protocol definitions	2009-11-05 21:40:17 -08:00
sm_make_chunk.c
sm_sideeffect.c
sm_statefuns.c	sctp: Set source addresses on the association before adding transports	2009-11-13 19:56:50 -08:00
sm_statetable.c
socket.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-11-17 00:05:02 -08:00
ssnmap.c
sysctl.c
transport.c	sctp: Set socket source address when additing first transport	2009-11-13 19:56:52 -08:00
tsnmap.c
ulpevent.c
ulpqueue.c