Merge branch 'upstream-fixes' into upstream
authorJeff Garzik <jeff@garzik.org>
Mon, 12 Jun 2006 03:04:37 +0000 (23:04 -0400)
committerJeff Garzik <jeff@garzik.org>
Mon, 12 Jun 2006 03:04:37 +0000 (23:04 -0400)
commitfec69a97489f961026e24536dbb7b86ac663948c
tree869713470d81ebc261598489a2711960336c7c37
parent1049cb478783c74ca8c99ef70e7d2bf920b9335b
parent2f9719b61e1fcf7422a016ac4f2420a0cc6ba320
Merge branch 'upstream-fixes' into upstream

Conflicts:

drivers/scsi/sata_sil24.c
drivers/scsi/sata_mv.c
drivers/scsi/scsi_lib.c
include/linux/pci_ids.h