Merge branch 'upstream'
authorJeff Garzik <jgarzik@pobox.com>
Tue, 6 Dec 2005 09:52:48 +0000 (04:52 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Tue, 6 Dec 2005 09:52:48 +0000 (04:52 -0500)
commit701db69d6647f61e4660c9102d7f2fd5dffc203d
treee3ebe94f72b4bbdfad608d77d7b11719022b8c9b
parent6cf5bcaaf9a92225017f7a3f1a630f6b5147ad4a
parentfe79e683ccdb29c13b3e0d18507474b4e2d9aab6
Merge branch 'upstream'
drivers/scsi/libata-core.c
drivers/scsi/pdc_adma.c
drivers/scsi/sata_mv.c
drivers/scsi/sata_promise.c
drivers/scsi/sata_qstor.c
drivers/scsi/sata_sx4.c
include/linux/libata.h