Merge branch 'master' into upstream
authorJeff Garzik <jeff@garzik.org>
Fri, 23 Jun 2006 02:11:56 +0000 (22:11 -0400)
committerJeff Garzik <jeff@garzik.org>
Fri, 23 Jun 2006 02:11:56 +0000 (22:11 -0400)
commit71d530cd1b6d97094481002a04c77fea1c8e1c22
treee786da7145d83c19a594adf76ed90d52c51058b1
parentd7a80dad2fe19a2b8c119c8e9cba605474a75a2b
parentd588fcbe5a7ba8bba2cebf7799ab2d573717a806
Merge branch 'master' into upstream

Conflicts:

drivers/scsi/libata-core.c
drivers/scsi/libata-scsi.c
include/linux/pci_ids.h
drivers/scsi/Makefile
drivers/scsi/libata-core.c
drivers/scsi/libata-scsi.c
drivers/scsi/sata_vsc.c
drivers/scsi/scsi.c
drivers/scsi/scsi_error.c
drivers/scsi/scsi_lib.c
include/linux/pci_ids.h
include/scsi/scsi_cmnd.h