You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		17 years ago
..
auth.h	[SCTP]: Stop claiming that this is a "reference implementation"	17 years ago
checksum.h	…
command.h	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	17 years ago
constants.h	[SCTP]: Stop claiming that this is a "reference implementation"	17 years ago
sctp.h	Merge branch 'master' of ../net-2.6/	17 years ago
sm.h	[SCTP]: Remove sctp_add_cmd_sf wrapper bloat	17 years ago
structs.h	[SCTP]: Remove redundant wrapper functions.	17 years ago
tsnmap.h	[SCTP]: Stop claiming that this is a "reference implementation"	17 years ago
ulpevent.h	[SCTP]: Fix compiler warning about const qualifiers	17 years ago
ulpqueue.h	[SCTP]: Stop claiming that this is a "reference implementation"	17 years ago
user.h	[SCTP]: Update AUTH structures to match declarations in draft-16.	17 years ago