Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6
Linus Torvalds [Tue, 26 Jul 2005 20:28:47 +0000 (13:28 -0700)]
1  2 
drivers/message/fusion/mptfc.c
drivers/message/fusion/mptscsih.c
drivers/message/fusion/mptscsih.h
drivers/message/fusion/mptspi.c
drivers/scsi/aacraid/commctrl.c
drivers/scsi/libata-core.c
drivers/scsi/megaraid.c
drivers/scsi/scsi_lib.c
include/linux/pci_ids.h

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge