Merge branch 'upstream'
authorJeff Garzik <jeff@garzik.org>
Wed, 12 Apr 2006 20:54:43 +0000 (16:54 -0400)
committerJeff Garzik <jeff@garzik.org>
Wed, 12 Apr 2006 20:54:43 +0000 (16:54 -0400)
1  2 
drivers/scsi/libata-core.c
drivers/scsi/libata-eh.c
drivers/scsi/pdc_adma.c
drivers/scsi/sata_mv.c
drivers/scsi/sata_nv.c
drivers/scsi/sata_promise.c
drivers/scsi/sata_qstor.c
drivers/scsi/sata_sx4.c
drivers/scsi/sata_vsc.c
include/linux/libata.h

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge