Merge branch 'master' of /pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 into for-40...
Nicholas Bellinger [Fri, 20 May 2011 02:16:55 +0000 (02:16 +0000)]
1  2 
MAINTAINERS
drivers/scsi/mpt2sas/mpt2sas_ctl.c
drivers/scsi/scsi_transport_fc.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge