Linus Torvalds
0191b625ca
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 ...
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1429 commits)
net: Allow dependancies of FDDI & Tokenring to be modular.
igb: Fix build warning when DCA is disabled.
net: Fix warning fallout from recent NAPI interface changes.
gro: Fix potential use after free
sfc: If AN is enabled, always read speed/duplex from the AN advertising bits
sfc: When disabling the NIC, close the device rather than unregistering it
sfc: SFT9001: Add cable diagnostics
sfc: Add support for multiple PHY self-tests
sfc: Merge top-level functions for self-tests
sfc: Clean up PHY mode management in loopback self-test
sfc: Fix unreliable link detection in some loopback modes
sfc: Generate unique names for per-NIC workqueues
802.3ad: use standard ethhdr instead of ad_header
802.3ad: generalize out mac address initializer
802.3ad: initialize ports LACPDU from const initializer
802.3ad: remove typedef around ad_system
802.3ad: turn ports is_individual into a bool
802.3ad: turn ports is_enabled into a bool
802.3ad: make ntt bool
ixgbe: Fix set_ringparam in ixgbe to use the same memory pools.
...
Fixed trivial IPv4/6 address printing conflicts in fs/cifs/connect.c due
to the conversion to %pI (in this networking merge) and the addition of
doing IPv6 addresses (from the earlier merge of CIFS).
2008-12-28 12:49:40 -08:00
Merge branches 'tracing/ftrace', 'tracing/hw-branch-tracing' and 'tracing/ring-buffer'; commit 'v2.6.28' into tracing/core
2008-12-25 13:11:00 +01:00
pata_hpt366: no ATAPI DMA
2008-12-16 05:40:34 -05:00
atm: Driver for Solos PCI ADSL2+ card.
2008-12-26 01:26:11 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
2008-12-28 12:49:40 -08:00
Commands needing to be retried require a complete re-initialization.
2008-12-12 16:04:26 +01:00
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
2008-12-28 12:33:21 -08:00
crypto: talitos - Ack done interrupt in isr instead of tasklet
2008-12-25 11:02:33 +11:00
async_xor: dma_map destination DMA_BIDIRECTIONAL
2008-12-08 13:46:00 -07:00
edac: fix edac core deadlock when removing a device
2008-12-23 15:58:21 -08:00
firewire: fw-ohci: fix IOMMU resource exhaustion
2008-12-10 12:45:34 +01:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
2008-12-28 12:49:40 -08:00
drm/radeon: fix correctness of irq_enabled check for radeon.
2008-12-23 10:50:12 +10:00
sh: sh_mobile i2c clock framework support
2008-12-22 18:42:51 +09:00
drivers/ide/{cs5530.c,sc1200.c}: Move a dereference below a NULL test
2008-12-22 23:05:06 +01:00
ieee1394: add quirk fix for Freecom HDD
2008-12-14 01:13:13 +01:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
2008-12-28 12:49:40 -08:00
sh: sh_mobile keysc clock framework support
2008-12-22 18:42:51 +09:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
2008-12-28 12:49:40 -08:00
Merge branch 'linus' into tracing/hw-branch-tracing
2008-12-24 21:08:26 +01:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
2008-12-28 12:49:40 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
2008-12-28 12:49:40 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
2008-12-28 12:49:40 -08:00
Merge git://git.infradead.org/mtd-2.6
2008-12-09 08:28:36 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
2008-12-28 12:49:40 -08:00
Merge branches 'x86/apic', 'x86/cleanups', 'x86/cpufeature', 'x86/crashdump', 'x86/debug', 'x86/defconfig', 'x86/detect-hyper', 'x86/doc', 'x86/dumpstack', 'x86/early-printk', 'x86/fpu', 'x86/idle', 'x86/io', 'x86/memory-corruption-check', 'x86/microcode', 'x86/mm', 'x86/mtrr', 'x86/nmi-watchdog', 'x86/pat2', 'x86/pci-ioapic-boot-irq-quirks', 'x86/ptrace', 'x86/quirks', 'x86/reboot', 'x86/setup-memory', 'x86/signal', 'x86/sparse-fixes', 'x86/time', 'x86/uv' and 'x86/xen' into x86/core
2008-12-23 16:27:23 +01:00
pcmcia: blackfin: fix bug - add missing ; to MODULE macro
2008-12-15 16:27:06 -08:00
rtc: rtc-isl1208: reject invalid dates
2008-12-23 15:58:21 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
2008-12-28 12:49:40 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
2008-12-28 12:49:40 -08:00
serial: sh-sci: Fix up port pinmux for SH7366.
2008-12-22 18:44:49 +09:00
sh: maple: Do not pass SLAB_POISON to kmem_cache_create()
2008-12-16 16:40:32 +09:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
2008-12-28 12:49:40 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
2008-12-28 12:49:40 -08:00
video: sh_mobile_lcdcfb deferred io support
2008-12-22 18:44:48 +09:00
w1: fix slave selection on big-endian systems
2008-12-23 15:58:21 -08:00
xen: clean up asm/xen/hypervisor.h
2008-12-16 21:50:31 +01:00
0191b625ca