Merge branch 'upstream' into pata-drivers

481ff126 · Jeff Garzik · 669a5db4 · 9bec2e38 · 481ff126 · 481ff126
Commit 481ff126 authored Aug 31, 2006 by Jeff Garzik
Showing with 5 additions and 5 deletions

drivers/ata/ahci.c drivers/ata/ahci.c +1 -1

drivers/ata/pdc_adma.c drivers/ata/pdc_adma.c +1 -1

include/linux/ata.h include/linux/ata.h +2 -2

include/linux/libata.h include/linux/libata.h +1 -1

No files found.
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
--- a/drivers/ata/pdc_adma.c
+++ b/drivers/ata/pdc_adma.c
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
--- a/include/linux/libata.h
+++ b/include/linux/libata.h