Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6

diff --cc drivers/message/fusion/mptfc.c
Simple merge

diff --cc drivers/message/fusion/mptscsih.c
Simple merge

diff --cc drivers/message/fusion/mptscsih.h
Simple merge

diff --cc drivers/message/fusion/mptspi.c
Simple merge

diff --cc drivers/scsi/aacraid/commctrl.c
Simple merge

diff --cc drivers/scsi/libata-core.c
Simple merge

diff --cc drivers/scsi/megaraid.c
Simple merge

diff --cc drivers/scsi/scsi_lib.c
Simple merge

diff --cc include/linux/pci_ids.h
Simple merge