Merge branch 'upstream'
authorJeff Garzik <jeff@garzik.org>
Fri, 24 Mar 2006 14:24:04 +0000 (09:24 -0500)
committerJeff Garzik <jeff@garzik.org>
Fri, 24 Mar 2006 14:24:04 +0000 (09:24 -0500)
commit11ed56fb7899f9eb9eaef8e5919db1bf08f1b07e
treeb01421cb139b11065d776ed361a7a12b3a1aecc9
parent54da9a3968448681d0ddf193ec90f2480c5cba1c
parent2cc432eed0491df66e14b578139bba2c75fb3f9a
Merge branch 'upstream'

Conflicts:

drivers/scsi/sata_vsc.c
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/ata.h
include/linux/libata.h