David S. Miller 9b963e5d0e Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/ieee802154/fakehard.c drivers/net/e1000e/ich8lan.c drivers/net/e1000e/phy.c drivers/net/netxen/netxen_nic_init.c drivers/net/wireless/ath/ath9k/main.c		2009-11-29 00:57:15 -08:00
..
auth.h	[SCTP]: Stop claiming that this is a "reference implementation"	2008-02-05 10:59:07 -05:00
checksum.h	sctp: Clean up sctp checksumming code	2009-02-16 00:03:10 -08:00
command.h	sctp: Send user messages to the lower layer as one	2009-09-04 18:20:57 -04:00
constants.h	sctp: Update SWS avaoidance receiver side algorithm	2009-11-23 15:53:57 -05:00
sctp.h	net: cleanup include/net	2009-11-04 05:06:25 -08:00
sm.h	sctp: Fix malformed "Invalid Stream Identifier" error	2009-11-23 15:53:56 -05:00
structs.h	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-11-29 00:57:15 -08:00
tsnmap.h	sctp: shrink sctp_tsnmap some more by removing gabs array	2008-10-08 14:19:01 -07: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: Turn the enum socket options into defines	2009-11-23 15:53:59 -05:00