David S. Miller 6a7ebdf2fd Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:
	net/bluetooth/l2cap_core.c

2011-07-14 07:56:40 -07:00

..

associola.c

sctp: Add ASCONF operation on the single-homed host

2011-06-02 02:04:53 -07:00

auth.c

…

bind_addr.c

net: Remove casts of void *

2011-06-16 23:19:27 -04:00

chunk.c

…

command.c

…

debug.c

…

endpointola.c

…

input.c

net: Remove casts of void *

2011-06-16 23:19:27 -04:00

inqueue.c

…

ipv6.c

sctp: Add Auto-ASCONF support (core).

2011-06-02 02:04:53 -07:00

Kconfig

…

Makefile

…

objcnt.c

…

output.c

…

outqueue.c

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2011-07-14 07:56:40 -07:00

primitive.c

…

probe.c

…

proc.c

…

protocol.c

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2011-07-14 07:56:40 -07:00

sm_make_chunk.c

net: Remove casts of void *

2011-06-16 23:19:27 -04:00

sm_sideeffect.c

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2011-07-14 07:56:40 -07:00

sm_statefuns.c

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2011-07-14 07:56:40 -07:00

sm_statetable.c

sctp: Enforce retransmission limit during shutdown

2011-07-07 14:08:44 -07:00

socket.c

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2011-07-14 07:56:40 -07:00

ssnmap.c

…

sysctl.c

sctp: Add sysctl support for Auto-ASCONF.

2011-06-02 02:04:53 -07:00

transport.c

…

tsnmap.c

…

ulpevent.c

sctp: ABORT if receive, reassmbly, or reodering queue is not empty while closing socket

2011-07-08 09:53:08 -07:00

ulpqueue.c

…