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

Conflicts:

	drivers/net/ehea/ehea_main.c
	drivers/net/wireless/iwlwifi/Kconfig
	drivers/net/wireless/rt2x00/rt61pci.c
	net/ipv4/inet_timewait_sock.c
	net/ipv6/raw.c
	net/mac80211/ieee80211_sta.c

2008-04-14 02:30:23 -07:00

..

associola.c

[SCTP]: "list_for_each()" -> "list_for_each_entry()" where appropriate.

2008-04-12 18:54:24 -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

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

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

endpointola.c

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

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

input.c

SCTP: Remove useless assignment from __sctp_rcv_lookup_endpoint

2008-04-10 02:00:23 -07:00

inqueue.c

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

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

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

[SCTP]: Use crc32c library for checksum calculations.

2008-01-28 14:58:20 -08:00

Makefile

[SCTP]: Use crc32c library for checksum calculations.

2008-01-28 14:58:20 -08:00

objcnt.c

[SCTP]: Use proc_create() to setup ->proc_fops first

2008-02-28 14:13:16 -08:00

output.c

net: replace remaining __FUNCTION__ occurrences

2008-03-05 20:47:47 -08:00

outqueue.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

primitive.c

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

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

proc.c

[SCTP]: "list_for_each()" -> "list_for_each_entry()" where appropriate.

2008-04-12 18:54:24 -07:00

protocol.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_make_chunk.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_sideeffect.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_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

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

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

socket.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

ssnmap.c

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

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

sysctl.c

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

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

transport.c

net: replace remaining __FUNCTION__ occurrences

2008-03-05 20:47:47 -08:00

tsnmap.c

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

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

ulpevent.c

[SCTP]: Fix compiler warning about const qualifiers

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

ulpqueue.c

[SCTP]: Correctly reap SSNs when processing FORWARD_TSN chunk

2008-02-06 21:26:26 -05:00