Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-12 07:01:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
15b1c0e822
linux/include/net/sctp
History
David Howells 4c1ac1b491 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 
Conflicts:

	drivers/infiniband/core/iwcm.c
	drivers/net/chelsio/cxgb2.c
	drivers/net/wireless/bcm43xx/bcm43xx_main.c
	drivers/net/wireless/prism54/islpci_eth.c
	drivers/usb/core/hub.h
	drivers/usb/input/hid-core.c
	net/core/netpoll.c

Fix up merge failures with Linus's head and fix new compilation failures.

Signed-Off-By: David Howells <dhowells@redhat.com>
2006-12-05 14:37:56 +00:00
..
command.h [SCTP]: SCTP_CMD_PROCESS_CTSN annotations. 2006-12-02 21:27:14 -08:00
constants.h [SCTP]: Trivial sctp endianness annotations. 2006-12-02 21:26:23 -08:00
sctp.h [SCTP]: Trivial sctp endianness annotations. 2006-12-02 21:26:23 -08:00
sm.h [SCTP]: Trivial sctp endianness annotations. 2006-12-02 21:26:23 -08:00
structs.h Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 2006-12-05 14:37:56 +00:00
tsnmap.h [SCTP]: Annotate tsn_dups. 2006-12-02 21:26:22 -08:00
ulpevent.h [SCTP]: Fix receive buffer accounting. 2006-10-11 23:59:44 -07:00
ulpqueue.h [PATCH] gfp flags annotations - part 1 2005-10-08 15:00:57 -07:00
user.h [SCTP]: Verify all the paths to a peer via heartbeat before using them. 2006-07-21 14:48:50 -07:00