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

Conflicts:

	drivers/net/wireless/iwlwifi/iwl-3945.c
	net/mac80211/mlme.c

2008-07-08 16:30:17 -07:00

..

associola.c

sctp: Kill unused variable in sctp_assoc_bh_rcv()

2008-06-20 10:34:47 -07:00

auth.c

…

bind_addr.c

…

chunk.c

…

command.c

…

debug.c

…

endpointola.c

…

input.c

sctp: Validate Initiate Tag when handling ICMP message

2008-06-19 16:07:48 -07:00

inqueue.c

…

ipv6.c

…

Kconfig

…

Makefile

…

objcnt.c

…

output.c

sctp: Follow security requirement of responding with 1 packet

2008-06-19 16:08:18 -07:00

outqueue.c

sctp: Follow security requirement of responding with 1 packet

2008-06-19 16:08:18 -07:00

primitive.c

…

proc.c

…

protocol.c

sctp: fix error path in sctp_proc_init

2008-06-17 15:54:14 -07:00

sm_make_chunk.c

…

sm_sideeffect.c

sctp: Follow security requirement of responding with 1 packet

2008-06-19 16:08:18 -07:00

sm_statefuns.c

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

2008-07-08 16:30:17 -07:00

sm_statetable.c

…

socket.c

sctp: Mark GET_PEER|LOCAL_ADDR_OLD deprecated.

2008-07-01 20:06:22 -07:00

ssnmap.c

…

sysctl.c

…

transport.c

…

tsnmap.c

…

ulpevent.c

sctp: Mark the tsn as received after all allocations finish

2008-07-08 02:28:39 -07:00

ulpqueue.c

…