Merge ../linux-2.6

diff --cc MAINTAINERS
Simple merge

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

diff --cc drivers/scsi/Kconfig
Simple merge

diff --cc drivers/scsi/aic7xxx/aic7xxx_pci.c
Simple merge

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

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

diff --cc drivers/scsi/qla2xxx/qla_os.c
Simple merge

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

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

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

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