Merge branch 'master' of /pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 into for-40...
authorNicholas Bellinger <nab@linux-iscsi.org>
Fri, 20 May 2011 02:16:55 +0000 (02:16 +0000)
committerNicholas Bellinger <nab@linux-iscsi.org>
Fri, 20 May 2011 02:16:55 +0000 (02:16 +0000)
commit129257c6af28fadf7c81b796a6ed06db1fcf1b1d
tree8f90515ebab95d98d1db4e8efce8a50019e633ed
parent693d92a1bbc9e42681c42ed190bd42b636ca876f
parent6ad11eaa8a689a27e0c99905bcf800a37cd432a0
Merge branch 'master' of /linux/kernel/git/jejb/scsi-misc-2.6 into for-40-iscsi-target-merge-v3
MAINTAINERS
drivers/scsi/mpt2sas/mpt2sas_ctl.c
drivers/scsi/scsi_transport_fc.c