Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 26 Jul 2005 20:28:47 +0000 (13:28 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 26 Jul 2005 20:28:47 +0000 (13:28 -0700)
commit2d986010ad13a00b83851238d52601d6092df40e
tree6a43ffd30290fc051435643d485ad12fb1448ed5
parent6b6a93c6876ea1c530d5d3f68e3678093a27fab0
parente10fb91c4dc81a4ae47caf0828df152f600f2546
Merge /linux/kernel/git/jejb/scsi-for-linus-2.6
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