Linus Torvalds d0b952a983 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (109 commits) [ETHTOOL]: Fix UFO typo [SCTP]: Fix persistent slowdown in sctp when a gap ack consumes rx buffer. [SCTP]: Send only 1 window update SACK per message. [SCTP]: Don't do CRC32C checksum over loopback. [SCTP] Reset rtt_in_progress for the chunk when processing its sack. [SCTP]: Reject sctp packets with broadcast addresses. [SCTP]: Limit association max_retrans setting in setsockopt. [PFKEYV2]: Fix inconsistent typing in struct sadb_x_kmprivate. [IPV6]: Sum real space for RTAs. [IRDA]: Use put_unaligned() in irlmp_do_discovery(). [BRIDGE]: Add support for NETIF_F_HW_CSUM devices [NET]: Add NETIF_F_GEN_CSUM and NETIF_F_ALL_CSUM [TG3]: Convert to non-LLTX [TG3]: Remove unnecessary tx_lock [TCP]: Add tcp_slow_start_after_idle sysctl. [BNX2]: Update version and reldate [BNX2]: Use CPU native page size [BNX2]: Use compressed firmware [BNX2]: Add firmware decompression [BNX2]: Allow WoL settings on new 5708 chips ... Manual fixup for conflict in drivers/net/tulip/winbond-840.c		2006-06-19 18:55:56 -07:00
..
acpi
asm-alpha	[PATCH] alpha: SMP IRQ routing fix	2006-06-05 12:29:16 -07:00
asm-arm	[ARM] 3547/1: PXA-OHCI: Allow platforms to specify a power budget	2006-06-08 22:44:07 +01:00
asm-arm26
asm-cris	[PATCH] sys_kexec_load() naming fixups	2006-04-11 06:18:42 -07:00
asm-frv	[PATCH] sys_kexec_load() naming fixups	2006-04-11 06:18:42 -07:00
asm-generic	[SPARC64]: Fix D-cache corruption in mremap	2006-06-01 17:47:25 -07:00
asm-h8300	[PATCH] sys_kexec_load() naming fixups	2006-04-11 06:18:42 -07:00
asm-i386	[PATCH] x86_64: avoid IRQ0 ioapic pin collision	2006-05-08 09:34:56 -07:00
asm-ia64	[IA64] remove asm-ia64/bitops.h self-inclusion	2006-05-05 11:37:15 -07:00
asm-m32r	[PATCH] m32r: update switch_to macro for tuning	2006-04-19 09:13:51 -07:00
asm-m68k
asm-m68knommu
asm-mips	[MIPS] Fix sparsemem support.	2006-06-06 00:15:20 +01:00
asm-parisc	[PARISC] Make ioremap default to _nocache	2006-04-21 22:20:35 +00:00
asm-powerpc	[PATCH] powerpc: enable CPU_FTR_CI_LARGE_PAGE for cell	2006-06-17 10:56:24 -07:00
asm-ppc	powerpc/32: Define an is_kernel_addr() to fix ARCH=ppc compilation	2006-05-09 16:00:59 +10:00
asm-s390	[PATCH] s390: fix in-user atomic futex operation.	2006-06-08 15:15:30 -07:00
asm-sh	[PATCH] sys_kexec_load() naming fixups	2006-04-11 06:18:42 -07:00
asm-sh64	[PATCH] sys_kexec_load() naming fixups	2006-04-11 06:18:42 -07:00
asm-sparc	[SPARC]: Add robust futex syscall entries.	2006-05-21 21:22:53 -07:00
asm-sparc64	[SPARC64]: Fix D-cache corruption in mremap	2006-06-01 17:47:25 -07:00
asm-um	[PATCH] uml: more __user annotations	2006-06-05 12:29:17 -07:00
asm-v850	[PATCH] Remove unused prepare_to_switch macro	2006-04-11 06:18:34 -07:00
asm-x86_64	[PATCH] x86_64: Fix stack/mmap randomization for compat tasks	2006-05-30 20:31:05 -07:00
asm-xtensa	[PATCH] request_irq(): remove warnings from irq probing	2006-04-28 08:33:46 -07:00
keys
linux	Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2006-06-19 18:55:56 -07:00
math-emu
media	V4L/DVB (3702): Make msp3400 routing defines more consistent	2006-04-02 04:56:11 -03:00
mtd
net	Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2006-06-19 18:55:56 -07:00
pcmcia	[PATCH] pcmcia: declare pccard_iodyn_ops (fix m8xx_pcmcia.c compilation error)	2006-03-31 21:49:51 +02:00
rdma	IB: simplify static rate encoding	2006-04-10 09:43:47 -07:00
rxrpc
scsi	[SCSI] srp.h: avoid padding of structs	2006-04-28 10:14:15 -05:00
sound	[ALSA] Fix Oops at rmmod with CONFIG_SND_VERBOSE_PROCFS=n	2006-04-27 21:10:42 +02:00
video