Merge branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Mon, 31 Oct 2005 01:25:28 +0000 (20:25 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Mon, 31 Oct 2005 01:25:28 +0000 (20:25 -0500)
commit122401ce39faab22b29eb11b20e4342f7f566b1b
treee164f8fa5decc4b7182e7d66b1634c7fd43b9f7f
parent94ec1ef1cf29e137e5c79372e432b040c6604be6
parent6e9d6b8ee4e0c37d3952256e6472c57490d6780d
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