Gerrit Renker
22b71c8f4f
tcp/dccp: Consolidate common code for RFC 3390 conversion ...
This patch consolidates initial-window code common to TCP and CCID-2:
* TCP uses RFC 3390 in a packet-oriented manner (tcp_input.c) and
* CCID-2 uses RFC 3390 in packet-oriented manner (RFC 4341).
Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-08-30 13:45:26 -07:00
Merge branch 'linus' into release
2010-08-15 01:06:31 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
2010-08-15 17:31:43 -07:00
include: replace unifdef-y with header-y
2010-08-14 22:26:51 +02:00
DNS: Separate out CIFS DNS Resolver code
2010-08-05 17:17:51 +00:00
tcp: Add TCP_USER_TIMEOUT socket option.
2010-08-30 13:23:33 -07:00
V4L/DVB: cx2341x: convert to the control framework
2010-08-08 23:43:05 -03:00
mtd: Update copyright notices
2010-08-08 20:58:20 +01:00
tcp/dccp: Consolidate common code for RFC 3390 conversion
2010-08-30 13:45:26 -07:00
pcmcia: use struct resource for PCMCIA devices, part 2
2010-08-03 09:04:16 +02:00
IB: Rename RAW_ETY to RAW_ETHERTYPE
2010-08-04 10:44:19 -07:00
scsi: use __uX types for headers exported to user space
2010-08-11 08:59:01 -07:00
include: replace unifdef-y with header-y
2010-08-14 22:26:51 +02:00
Merge branch 'for-2.6.36' of git://git.kernel.dk/linux-2.6-block
2010-08-10 15:22:42 -07:00
include: replace unifdef-y with header-y
2010-08-14 22:26:51 +02:00
Merge branch 'stable/xen-swiotlb-0.8.6' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
2010-08-12 09:09:41 -07:00
22b71c8f4f