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

Conflicts:
	Documentation/feature-removal-schedule.txt
	drivers/net/wireless/ath/ar9170/usb.c
	drivers/scsi/iscsi_tcp.c
	net/ipv4/ipmr.c

2010-05-12 00:05:35 -07:00

..

auth.h

[SCTP]: Stop claiming that this is a "reference implementation"

2008-02-05 10:59:07 -05:00

checksum.h

sctp: Clean up sctp checksumming code

2009-02-16 00:03:10 -08:00

command.h

sctp: Fix oops when sending queued ASCONF chunks

2010-04-28 12:16:34 -07:00

constants.h

sctp: Update SWS avaoidance receiver side algorithm

2009-11-23 15:53:57 -05:00

sctp.h

Merge branch 'net-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vxy/lksctp-dev

2010-05-03 16:24:31 -07:00

sm.h

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

2010-05-12 00:05:35 -07:00

structs.h

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

2010-05-12 00:05:35 -07:00

tsnmap.h

sctp: shrink sctp_tsnmap some more by removing gabs array

2008-10-08 14:19:01 -07:00

ulpevent.h

[SCTP]: Fix compiler warning about const qualifiers

2008-04-12 18:40:06 -07:00

ulpqueue.h

[SCTP]: Stop claiming that this is a "reference implementation"

2008-02-05 10:59:07 -05:00

user.h

sctp: Turn the enum socket options into defines

2009-11-23 15:53:59 -05:00