merge by hand (fix up qla_os.c merge error)

Documentation/DocBook/Makefile

Documentation/DocBook/scsidrivers.tmpl

Documentation/scsi/ChangeLog.megaraid

Documentation/scsi/scsi-changer.txt

Documentation/scsi/scsi_mid_low_api.txt

drivers/block/cciss.c

drivers/block/elevator.c

drivers/block/ll_rw_blk.c

drivers/block/paride/pd.c

drivers/block/sx8.c

drivers/fc4/fc.c

drivers/fc4/fc_syms.c

drivers/fc4/fcp_impl.h

drivers/ieee1394/sbp2.c

drivers/ieee1394/sbp2.h

drivers/message/fusion/Kconfig

drivers/message/fusion/Makefile

drivers/message/fusion/lsi/mpi.h

drivers/message/fusion/lsi/mpi_cnfg.h

drivers/message/fusion/lsi/mpi_fc.h