Merge branch 'upstream'
authorJeff Garzik <jgarzik@pobox.com>
Sun, 30 Oct 2005 09:50:22 +0000 (04:50 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Sun, 30 Oct 2005 09:50:22 +0000 (04:50 -0500)
commit054ee8fd39f1b5d50e803f126b63f400d631eea4
tree2819e388f853de88e09635de8e38017b563069bc
parentf0612bbc41f65f5a684f69d714a1a17a6f0f40c5
parenta7dac447bb9cef27d4d29cdf63e2d7809c50b1f4
Merge branch 'upstream'
drivers/scsi/ahci.c
drivers/scsi/libata-core.c
drivers/scsi/libata-scsi.c
drivers/scsi/pdc_adma.c
drivers/scsi/sata_mv.c
drivers/scsi/sata_qstor.c
drivers/scsi/sata_sil24.c
drivers/scsi/sata_sx4.c
include/linux/libata.h