Merge branch 'upstream'
authorJeff Garzik <jeff@garzik.org>
Sun, 2 Apr 2006 14:30:40 +0000 (10:30 -0400)
committerJeff Garzik <jeff@garzik.org>
Sun, 2 Apr 2006 14:30:40 +0000 (10:30 -0400)
commit029f5468b5b5f93a09bf90326fdcb9124079658d
treef869fb02ad1ca49e0920e073b22cbb96a184ccae
parent8e181c14f2baa5be9b7f7c3917b7d4ecf7529110
parent1ad8e7f9eb051b040880e45337ed74bfd916ef7f
Merge branch 'upstream'

Conflicts:

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
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