[SCSI] Merge scsi-misc-2.6 into scsi-rc-fixes-2.6

Signed-off-by: James Bottomley <James.Bottomley@suse.de>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/s390/scsi/zfcp_fsf.c
Simple merge

diff --cc drivers/scsi/bnx2i/bnx2i_init.c
Simple merge

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

diff --cc drivers/scsi/qla4xxx/ql4_mbx.c
Simple merge

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

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

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