David Woodhouse 66643de455 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 ... Conflicts: include/asm-powerpc/unistd.h include/asm-sparc/unistd.h include/asm-sparc64/unistd.h Signed-off-by: David Woodhouse <dwmw2@infradead.org>		2006-05-24 09:22:21 +01:00
..
command.h	[SCTP]: Set sk_err so that poll wakes up after a non-blocking connect failure.	2006-05-19 10:58:12 -07:00
constants.h	[TCP]: Move the tcp sock states to net/tcp_states.h	2005-08-29 15:41:54 -07:00
sctp.h	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6	2006-05-24 09:22:21 +01:00
sm.h	[PATCH] gfp flags annotations - part 1	2005-10-08 15:00:57 -07:00
structs.h	[SCTP]: Allow spillover of receive buffer to avoid deadlock.	2006-05-05 17:02:09 -07:00
tsnmap.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
ulpevent.h	[PATCH] gfp flags annotations - part 1	2005-10-08 15:00:57 -07:00
ulpqueue.h	[PATCH] gfp flags annotations - part 1	2005-10-08 15:00:57 -07:00
user.h	[SCTP]: Add support for SCTP_DELAYED_ACK_TIME socket option.	2006-01-03 13:11:13 -08:00