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)
commita890b15c0990cc8d686edcc85f5fccde71ad5ce9
tree73162355b58283a2531f13fbbf663809f95c1483
parent79fa1b677be3a985cc66b9218a4dd09818f1051b
parent26ec634c31a11a003040e10b4d650495158632fd
Merge branch 'upstream'
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