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

..

auth.h

…

checksum.h

…

command.h

sctp: Enforce retransmission limit during shutdown

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

constants.h

sctp: remove completely unsed EMPTY state

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

sctp.h

include/net: Remove unnecessary semicolons

2011-06-05 14:33:40 -07:00

sm.h

sctp: implement event notification SCTP_SENDER_DRY_EVENT

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

structs.h

sctp: Add ASCONF operation on the single-homed host

2011-06-02 02:04:53 -07: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