[SCSI] Merge scsi-misc-2.6 into scsi-rc-fixes-2.6
James Bottomley [Tue, 18 May 2010 14:33:43 +0000 (10:33 -0400)]
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

1  2 
MAINTAINERS
drivers/s390/scsi/zfcp_fsf.c
drivers/scsi/bnx2i/bnx2i_init.c
drivers/scsi/iscsi_tcp.c
drivers/scsi/qla4xxx/ql4_mbx.c
drivers/scsi/scsi_debug.c
drivers/scsi/scsi_error.c
drivers/scsi/sd.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge