David S. Miller abb434cb05 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	net/bluetooth/l2cap_core.c

Just two overlapping changes, one added an initialization of
a local variable, and another change added a new local variable.

Signed-off-by: David S. Miller <davem@davemloft.net>

2011-12-23 17:13:56 -05:00

..

auth.h

…

checksum.h

…

command.h

sctp: deal with multiple COOKIE_ECHO chunks

2011-09-16 17:17:22 -04:00

constants.h

sctp: remove completely unsed EMPTY state

2011-04-20 01:51:03 -07:00

sctp.h

net: use IS_ENABLED(CONFIG_IPV6)

2011-12-11 18:25:16 -05:00

sm.h

sctp: implement event notification SCTP_SENDER_DRY_EVENT

2011-04-21 10:35:44 -07:00

structs.h

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2011-12-23 17:13:56 -05:00

tsnmap.h

…

ulpevent.h

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

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

ulpqueue.h

…

user.h

sctp: Add socket option operation for Auto-ASCONF.

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