diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-08-22 12:10:49 +0200 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-08-22 12:10:49 +0200 |
commit | f89b2b5ddcace8959f760c0556369bd19bda0548 (patch) | |
tree | 520c9530340056a9cc3f86f65027d22fd401b0a4 /drivers/ata/sata_via.c | |
parent | [PATCH] libata: s/CONFIG_SCSI_SATA/CONFIG_[S]ATA/g in pci/quirks.c (diff) | |
parent | [PATCH] ata_piix: fix ghost device probing by honoring PCS present bits (diff) | |
download | linux-f89b2b5ddcace8959f760c0556369bd19bda0548.tar.xz linux-f89b2b5ddcace8959f760c0556369bd19bda0548.zip |
Merge branch 'upstream-fixes' into upstream
Conflicts:
drivers/ata/ata_piix.c
Diffstat (limited to 'drivers/ata/sata_via.c')
0 files changed, 0 insertions, 0 deletions