Merge branch 'tmp'
authorJeff Garzik <jgarzik@pobox.com>
Fri, 27 Jan 2006 07:37:46 +0000 (02:37 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Fri, 27 Jan 2006 07:37:46 +0000 (02:37 -0500)
commitb4d28889f7ebfe498dedaceb773b4c785b97d195
tree7ac1070f4c956d035f40cc3b381b5868b980fafa
parent7dfb869c8e45e5863534f38fdac990829b22964a
parent041c5fc33cb7ed4fe5322585a611fb6e29a05d3a
Merge branch 'tmp'
drivers/scsi/libata-core.c
drivers/scsi/pdc_adma.c
drivers/scsi/sata_mv.c
drivers/scsi/sata_promise.c
drivers/scsi/sata_qstor.c
drivers/scsi/sata_sx4.c
include/linux/libata.h