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

Conflicts:
	drivers/net/tokenring/tmspci.c
	drivers/net/ucc_geth_mii.c

2009-03-05 02:06:47 -08:00

..

associola.c

sctp: Rework the tsn map to use generic bitmap.

2008-10-08 14:18:39 -07:00

auth.c

fix similar typos to successfull

2009-01-08 08:31:15 -08:00

bind_addr.c

sctp: try harder to figure out address family when checking wildcards

2008-10-01 11:33:06 -04:00

chunk.c

…

command.c

…

debug.c

sctp: Add some missing types for debug message

2009-03-02 22:49:16 -08:00

endpointola.c

sctp: fix potential panics in the SCTP-AUTH API.

2008-08-21 03:34:25 -07:00

input.c

sctp: Clean up sctp checksumming code

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

inqueue.c

…

ipv6.c

sctp: Inherit all socket options from parent correctly.

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

Kconfig

sctp: Don't abort initialization when CONFIG_PROC_FS=n

2008-07-18 23:03:44 -07:00

Makefile

sctp: Don't abort initialization when CONFIG_PROC_FS=n

2008-07-18 23:03:44 -07:00

objcnt.c

…

output.c

sctp: Clean up sctp checksumming code

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

outqueue.c

sctp: use time_before or time_after for comparing jiffies

2009-03-02 22:49:18 -08:00

primitive.c

…

proc.c

sctp: remove sctp_assoc_proc_exit()

2008-07-22 14:21:30 -07:00

protocol.c

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

2009-03-05 02:06:47 -08:00

sm_make_chunk.c

net: replace uses of __constant_{endian}

2009-02-01 00:45:17 -08:00

sm_sideeffect.c

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

2009-03-05 02:06:47 -08:00

sm_statefuns.c

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

2009-03-05 02:06:47 -08:00

sm_statetable.c

sctp: Fix to handle SHUTDOWN in SHUTDOWN_RECEIVED state

2008-10-23 01:01:18 -07:00

socket.c

sctp: fix the length check in sctp_getsockopt_maxburst()

2009-03-02 22:49:17 -08:00

ssnmap.c

…

sysctl.c

net: '&' redux

2008-11-03 18:21:05 -08:00

transport.c

sctp: use time_before or time_after for comparing jiffies

2009-03-02 22:49:18 -08:00

tsnmap.c

trivial: fix then -> than typos in comments and documentation

2009-01-06 11:28:06 +01:00

ulpevent.c

sctp: Rework the tsn map to use generic bitmap.

2008-10-08 14:18:39 -07:00

ulpqueue.c

net: Remove __skb_insert() calls outside of skbuff internals.

2008-09-21 21:28:51 -07:00