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

Documentation/scsi/aacraid.txt

drivers/message/fusion/Kconfig

drivers/message/fusion/lsi/mpi.h

drivers/message/fusion/lsi/mpi_cnfg.h

drivers/message/fusion/lsi/mpi_history.txt

drivers/message/fusion/lsi/mpi_init.h

drivers/message/fusion/lsi/mpi_ioc.h

drivers/message/fusion/lsi/mpi_log_fc.h

drivers/message/fusion/lsi/mpi_log_sas.h

drivers/message/fusion/lsi/mpi_sas.h

drivers/message/fusion/mptbase.c

drivers/message/fusion/mptbase.h

drivers/message/fusion/mptctl.c

drivers/message/fusion/mptfc.c

drivers/message/fusion/mptlan.c

drivers/message/fusion/mptsas.c

drivers/message/fusion/mptscsih.c

drivers/message/fusion/mptspi.c

drivers/message/i2o/pci.c

drivers/s390/scsi/zfcp_aux.c