Commit 39316e5f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'email' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi 

Pull email address update from James Bottomley:
 "My IBM email has stopped working, so update to a working email
  address"

* tag 'email' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  MAINTAINERS: update to working email address
parents 81777226 366c5cec

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -11995,7 +11995,7 @@ F: include/keys/encrypted-type.h 
F:	security/keys/encrypted-keys/









KEYS-TRUSTED









M:	James Bottomley <jejb@linux.ibm.com>









M:	James Bottomley <James.Bottomley@HansenPartnership.com>









M:	Jarkko Sakkinen <jarkko@kernel.org>









M:	Mimi Zohar <zohar@linux.ibm.com>









L:	linux-integrity@vger.kernel.org








@@ -19669,7 +19669,7 @@ F:	drivers/scsi/sg.c







F:	include/scsi/sg.h

















SCSI SUBSYSTEM









M:	"James E.J. Bottomley" <jejb@linux.ibm.com>









M:	"James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>









M:	"Martin K. Petersen" <martin.petersen@oracle.com>









L:	linux-scsi@vger.kernel.org









S:	Maintained