aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/netx-eth.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-10 14:50:16 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-10 14:50:16 -0700
commit64b853aa328f34dd58e4e617cded91e2ddbcac13 (patch)
tree34b201d952bc93ead6ca91ed18dab5fb87dacf03 /drivers/net/netx-eth.c
parent0f166396e7e8931bb4acfd1a6ea1bd4f0b43f1dd (diff)
parentc1e4fe711a410a139095e6b3e3ce3f07f466063c (diff)
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: (32 commits) [libata] sata_mv: print out additional chip info during probe [libata] Use ATA_UDMAx standard masks when filling driver's udma_mask info [libata] AHCI: Add support for Marvell AHCI-like chips (initially 6145) [libata] Clean up driver udma_mask initializers libata: Support chips with 64K PRD quirk Add a PCI ID for santa rosa's PATA controller. sata_sil24: sil24_interrupt() micro-optimisation Add irq_flags to struct pata_platform_info sata_promise: cleanups [libata] pata_ixp4xx: kill unused var ata_piix: fix pio/mwdma programming [libata] ahci: minor internal cleanups [ATA] Add named constant for ATAPI command DEVICE RESET [libata] sata_sx4, sata_via: minor documentation updates [libata] ahci: minor internal cleanups [libata] ahci: Factor out SATA port init into a separate function [libata] pata_sil680: minor cleanups from benh [libata] sata_sx4: named constant cleanup [libata] pata_ixp4xx: convert to new EH [libata] pdc_adma: Reorder initializers with a couple structs ...
Diffstat (limited to 'drivers/net/netx-eth.c')
0 files changed, 0 insertions, 0 deletions