Merge branch 'master'
authorJeff Garzik <jeff@garzik.org>
Thu, 23 Mar 2006 00:13:54 +0000 (19:13 -0500)
committerJeff Garzik <jeff@garzik.org>
Thu, 23 Mar 2006 00:13:54 +0000 (19:13 -0500)
1  2 
drivers/scsi/libata-core.c
drivers/scsi/libata-scsi.c
drivers/scsi/pdc_adma.c
drivers/scsi/sata_mv.c
drivers/scsi/sata_svw.c
drivers/scsi/sata_vsc.c
include/linux/libata.h

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge