summaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorJames Bottomley <James.Bottomley@HansenPartnership.com>2015-12-03 09:32:33 -0800
committerJames Bottomley <James.Bottomley@HansenPartnership.com>2015-12-03 09:32:33 -0800
commitbe9e2f775f5a3147205c552534c3abf0f9374a13 (patch)
tree9c10584796d73f80295d9c238a089f12621db316 /MAINTAINERS
parente619e6cbecb7fe97a924d625e848605333457b13 (diff)
parent3ddda3e4c82dea58933bde8d0f6ef34470c360cb (diff)
Merge branch 'mkp-fixes' into fixes
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS4
1 files changed, 3 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index e9caa4b28828..8174cc25dd69 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9411,8 +9411,10 @@ F: include/scsi/sg.h
SCSI SUBSYSTEM
M: "James E.J. Bottomley" <JBottomley@odin.com>
-L: linux-scsi@vger.kernel.org
T: git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git
+M: "Martin K. Petersen" <martin.petersen@oracle.com>
+T: git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git
+L: linux-scsi@vger.kernel.org
S: Maintained
F: drivers/scsi/
F: include/scsi/