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

..

auth.h

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

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

checksum.h

[SCTP]: Use crc32c library for checksum calculations.

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

command.h

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

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

constants.h

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

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

sctp.h

Merge branch 'master' of ../net-2.6/

2008-03-23 22:54:03 -07:00

sm.h

[SCTP]: Remove sctp_add_cmd_sf wrapper bloat

2008-03-27 17:54:29 -07:00

structs.h

[SCTP]: Remove redundant wrapper functions.

2008-03-23 22:47:08 -07:00

tsnmap.h

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

2008-02-05 10:59:07 -05: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]: Update AUTH structures to match declarations in draft-16.

2008-02-28 16:45:04 -05:00