David S. Miller 63fe46da9c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/wireless/iwlwifi/iwl-4965-rs.c drivers/net/wireless/rt2x00/rt61pci.c		2008-05-15 00:34:44 -07:00
..
associola.c	sctp: Bring SCTP_DELAYED_ACK socket option into API compliance	2008-05-09 15:13:26 -07:00
auth.c	[SCTP]: Update AUTH structures to match declarations in draft-16.	2008-02-28 16:45:04 -05:00
bind_addr.c	[SCTP]: "list_for_each()" -> "list_for_each_entry()" where appropriate.	2008-04-12 18:54:24 -07:00
chunk.c	SCTP: fix wrong debug counting of datamsg	2008-04-10 01:57:24 -07:00
command.c	[SCTP]: Remove sctp_add_cmd_sf wrapper bloat	2008-03-27 17:54:29 -07:00
debug.c
endpointola.c
input.c	SCTP: Remove useless assignment from __sctp_rcv_lookup_endpoint	2008-04-10 02:00:23 -07:00
inqueue.c
ipv6.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-04-14 02:30:23 -07:00
Kconfig
Makefile
objcnt.c	[NET]: Fix heavy stack usage in seq_file output routines.	2008-04-24 01:02:16 -07:00
output.c	net: replace remaining __FUNCTION__ occurrences	2008-03-05 20:47:47 -08:00
outqueue.c	SCTP: Initialize partial_bytes_acked to 0, when all of the data is acked.	2008-04-17 14:22:18 -07:00
primitive.c
proc.c	sctp: add sctp/remaddr table to complete RFC remote address table OID	2008-05-09 15:14:50 -07:00
protocol.c	sctp: add sctp/remaddr table to complete RFC remote address table OID	2008-05-09 15:14:50 -07:00
sm_make_chunk.c	sctp: Fix use of uninitialized pointer	2008-05-13 23:25:00 -07:00
sm_sideeffect.c	sctp: Bring SCTP_DELAYED_ACK socket option into API compliance	2008-05-09 15:13:26 -07:00
sm_statefuns.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-04-14 02:30:23 -07:00
sm_statetable.c
socket.c	sctp: Support the new specification of sctp_connectx()	2008-05-09 15:14:11 -07:00
ssnmap.c
sysctl.c
transport.c	net: replace remaining __FUNCTION__ occurrences	2008-03-05 20:47:47 -08:00
tsnmap.c
ulpevent.c	[SCTP]: Fix compiler warning about const qualifiers	2008-04-12 18:40:06 -07:00
ulpqueue.c