Merge branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Fri, 28 Oct 2005 16:29:23 +0000 (12:29 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Fri, 28 Oct 2005 16:29:23 +0000 (12:29 -0400)
commit7a9f8f93d2dad38f30fbc79d8a1e6517373aa4b6
tree9116e5bde860d00685c5b6eee7be5ba9899aabb9
parent972c26bdd6b58e7534473c4f7928584578cf43f4
parent5fadd053d9bb4345ec6f405d24db4e7eb49cf81e
Merge branch 'master'
drivers/scsi/ahci.c
drivers/scsi/libata-core.c
drivers/scsi/libata-scsi.c
drivers/scsi/pdc_adma.c
drivers/scsi/sata_mv.c
drivers/scsi/sata_qstor.c
drivers/scsi/sata_sil24.c
drivers/scsi/sata_sx4.c
include/linux/libata.h