Merge branch 'master'
authorJeff Garzik <jeff@garzik.org>
Tue, 11 Apr 2006 16:51:40 +0000 (12:51 -0400)
committerJeff Garzik <jeff@garzik.org>
Tue, 11 Apr 2006 16:51:40 +0000 (12:51 -0400)
commit10a5fd5e6b7e2d464c9f95f67cade4ddbd63f4e1
treeeddf856286234f28cac747d20eb59d918e1bc8b5
parentc2a6585296009379e0f4eff39cdcb108b457ebf2
parenta145410dccdb44f81d3b56763ef9b6f721f4e47c
Merge branch 'master'

Conflicts:

drivers/scsi/libata-scsi.c
include/linux/libata.h
17 files changed:
drivers/scsi/ahci.c
drivers/scsi/ata_piix.c
drivers/scsi/libata-scsi.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_sil.c
drivers/scsi/sata_sil24.c
drivers/scsi/sata_sis.c
drivers/scsi/sata_svw.c
drivers/scsi/sata_sx4.c
drivers/scsi/sata_uli.c
drivers/scsi/sata_via.c
drivers/scsi/sata_vsc.c
include/linux/libata.h