linux-sg2042/net/dccp
David Howells 9db7372445 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:

	drivers/ata/libata-scsi.c
	include/linux/libata.h

Futher merge of Linus's head and compilation fixups.

Signed-Off-By: David Howells <dhowells@redhat.com>
2006-12-05 17:01:28 +00:00
..
ccids [DCCP] tfrc: Binary search for reverse TFRC lookup 2006-12-03 14:53:27 -02:00
Kconfig [DCCP]: enable debug messages also for static builds 2006-12-02 21:24:35 -08:00
Makefile [DCCPv6]: Resolve conditional build problem 2006-12-02 21:22:28 -08:00
ackvec.c [DCCP] ackvec: Split long ack vectors across multiple options 2006-12-02 21:30:33 -08:00
ackvec.h [DCCP] ackvec: infrastructure for sending more than one ackvec per packet 2006-12-02 21:30:32 -08:00
ccid.c [DCCP] CCID: Improve CCID infrastructure 2006-03-20 19:21:44 -08:00
ccid.h [DCCP]: Use `unsigned' for packet lengths 2006-12-02 21:31:02 -08:00
dccp.h [DCCP]: Simplified conditions due to use of enum:8 states 2006-12-02 21:24:38 -08:00
diag.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
feat.c [DCCP]: Simplified conditions due to use of enum:8 states 2006-12-02 21:24:38 -08:00
feat.h [DCCP]: Make feature negotiation more readable 2006-12-02 21:22:29 -08:00
input.c [DCCP]: Simplified conditions due to use of enum:8 states 2006-12-02 21:24:38 -08:00
ipv4.c [DCCP]: Simplified conditions due to use of enum:8 states 2006-12-02 21:24:38 -08:00
ipv6.c [DCCP]: Simplified conditions due to use of enum:8 states 2006-12-02 21:24:38 -08:00
ipv6.h Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
minisocks.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
options.c [DCCP] ackvec: infrastructure for sending more than one ackvec per packet 2006-12-02 21:30:32 -08:00
output.c [DCCP]: Use `unsigned' for packet lengths 2006-12-02 21:31:02 -08:00
probe.c [DCCP]: Make dccp_probe more portable 2006-12-02 21:24:39 -08:00
proto.c [DCCP]: Make {set,get}sockopt(DCCP_SOCKOPT_PACKET_SIZE) return 0 2006-12-02 21:31:00 -08:00
sysctl.c [DCCP]: Remove allocation of sysctl numbers 2006-12-02 21:30:56 -08:00
timer.c [DCCP]: Remove forward declarations in timer.c 2006-12-02 21:22:20 -08:00