Merge branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Sat, 12 Nov 2005 04:39:35 +0000 (23:39 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Sat, 12 Nov 2005 04:39:35 +0000 (23:39 -0500)
commitf4256e301d9800b1e0276404cb01b3ac85b51067
tree975f56627b78f757608b31684311a24ca1478481
parentfb2a26b9f8f5eda6b96ba9753edf105e5999d6d9
parentcd52d1ee9a92587b242d946a2300a3245d3b885a
Merge branch 'master'
drivers/scsi/libata-core.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