Break up monolithic iommu table/lock into finer graularity pools and lock

[firefly-linux-kernel-4.4.55.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index d24e8a38ff63101ff577c7df86a17f541043307d..f7bbaece56498fcc75b722c042c9a1678a629b81 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8108,7 +8108,7 @@ S:        Maintained
 F:     drivers/net/wireless/rt2x00/
 
 RAMDISK RAM BLOCK DEVICE DRIVER
-M:     Nick Piggin <npiggin@kernel.dk>
+M:     Jens Axboe <axboe@kernel.dk>
 S:     Maintained
 F:     Documentation/blockdev/ramdisk.txt
 F:     drivers/block/brd.c
@@ -8655,11 +8655,9 @@ F:       drivers/scsi/sg.c
 F:     include/scsi/sg.h
 
 SCSI SUBSYSTEM
-M:     "James E.J. Bottomley" <JBottomley@parallels.com>
+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-misc-2.6.git
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-pending-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git
 S:     Maintained
 F:     drivers/scsi/
 F:     include/scsi/