Merge branch 'upstream'
authorJeff Garzik <jgarzik@pobox.com>
Thu, 9 Feb 2006 09:28:13 +0000 (04:28 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Thu, 9 Feb 2006 09:28:13 +0000 (04:28 -0500)
1  2 
drivers/scsi/libata-core.c
drivers/scsi/sata_mv.c
drivers/scsi/sata_promise.c
include/linux/libata.h

Simple merge
Simple merge
Simple merge
Simple merge