Merge ../linux-2.6

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

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

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

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

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