openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
linux/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
..
Kconfig Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
Makefile Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
associola.c 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
bind_addr.c [SCTP]: ->a_h is gone now. 2006-12-02 21:27:00 -08:00
chunk.c [PATCH] gfp flags annotations - part 1 2005-10-08 15:00:57 -07:00
command.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
crc32c.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
debug.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
endpointola.c 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
input.c [SCTP]: sctp_has_association() switched to net-endian. 2006-12-02 21:26:50 -08:00
inqueue.c WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
ipv6.c [SCTP]: Annotate ->supported_addrs(). 2006-12-02 21:27:11 -08:00
objcnt.c [SCTP]: Audit return code of create_proc_* 2005-07-18 13:38:07 -07:00
output.c [SCTP]: Include sk_buff overhead while updating the peer's receive window. 2006-09-29 17:09:05 -07:00
outqueue.c [SCTP]: Even more trivial sctp annotations. 2006-12-02 21:27:15 -08:00
primitive.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
proc.c [SCTP]: Switch ->primary_addr to net-endian. 2006-12-02 21:26:34 -08:00
protocol.c [SCTP]: Annotate ->supported_addrs(). 2006-12-02 21:27:11 -08:00
sm_make_chunk.c [SCTP]: Use kzalloc where appropriate 2006-12-02 21:30:19 -08:00
sm_sideeffect.c [SCTP]: SCTP_CMD_PROCESS_CTSN annotations. 2006-12-02 21:27:14 -08:00
sm_statefuns.c [SCTP]: Even more trivial sctp annotations. 2006-12-02 21:27:15 -08:00
sm_statetable.c [SCTP]: Cleanup of the sctp state table code. 2006-12-02 21:22:26 -08:00
socket.c [SCTP]: Get rid of the last remnants of sin_port flipping. 2006-12-02 21:27:09 -08:00
ssnmap.c [PATCH] gfp flags annotations - part 1 2005-10-08 15:00:57 -07:00
sysctl.c [SCTP]: Remove multiple levels of msecs to jiffies conversions. 2006-09-22 14:55:39 -07:00
transport.c [SCTP]: ->a_h is gone now. 2006-12-02 21:27:05 -08:00
tsnmap.c [SCTP]: More trivial sctp annotations. 2006-12-02 21:27:13 -08:00
ulpevent.c [SCTP]: More trivial sctp annotations. 2006-12-02 21:27:13 -08:00
ulpqueue.c [SCTP]: Fix receive buffer accounting. 2006-10-11 23:59:44 -07:00