Merge branch 'upstream'
authorJeff Garzik <jgarzik@pobox.com>
Sun, 30 Oct 2005 06:58:41 +0000 (01:58 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Sun, 30 Oct 2005 06:58:41 +0000 (01:58 -0500)
commitfce45c1c8a6b5334fa88bbb9b1496b0699d3fef0
treecba2597077cf33d122f8d771bf84618cc5374cf6
parent15dbb5a3f971a28040ae6cbcd8bbdf19b629fa83
parent81cfb8864c73230eb1c37753aba517db15cf4d8f
Merge branch 'upstream'
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_vsc.c
include/linux/libata.h