Merge branch 'upstream'
authorJeff Garzik <jgarzik@pobox.com>
Wed, 9 Nov 2005 06:20:26 +0000 (01:20 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Wed, 9 Nov 2005 06:20:26 +0000 (01:20 -0500)
commitc7c6e9494cc9a4a5b1a2ca870ed4531ad2b98a83
tree1185ddc2c4cea1c4da09d6b83893f91aefe7cd3d
parent8cedcfd43a0b00741fff43d6a4c1a8b7748db3b0
parent8e8b77dd4846b73f2e0756cf59123ee709246d11
Merge branch 'upstream'
drivers/scsi/libata-core.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_sx4.c
drivers/scsi/sata_vsc.c
include/linux/libata.h