Merge tag 'usb-4.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

[karo-tx-linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 12a0b416aa06b85609019aada75331f30d22b2a5..503bcf4e3e8ffd09750bf6ee1b9cce43c7351be6 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2483,7 +2483,7 @@ S:        Maintained
 F:     drivers/net/ethernet/ec_bhf.c
 
 BFS FILE SYSTEM
-M:     "Tigran A. Aivazian" <tigran@aivazian.fsnet.co.uk>
+M:     "Tigran A. Aivazian" <aivazian.tigran@gmail.com>
 S:     Maintained
 F:     Documentation/filesystems/bfs.txt
 F:     fs/bfs/
@@ -7923,7 +7923,7 @@ L:        linux-man@vger.kernel.org
 S:     Maintained
 
 MARDUK (CREATOR CI40) DEVICE TREE SUPPORT
-M:     Rahul Bedarkar <rahul.bedarkar@imgtec.com>
+M:     Rahul Bedarkar <rahulbedarkar89@gmail.com>
 L:     linux-mips@linux-mips.org
 S:     Maintained
 F:     arch/mips/boot/dts/img/pistachio_marduk.dts
@@ -9553,10 +9553,6 @@ F:       drivers/net/wireless/intersil/orinoco/
 
 OSD LIBRARY and FILESYSTEM
 M:     Boaz Harrosh <ooo@electrozaur.com>
-M:     Benny Halevy <bhalevy@primarydata.com>
-L:     osd-dev@open-osd.org
-W:     http://open-osd.org
-T:     git git://git.open-osd.org/open-osd.git
 S:     Maintained
 F:     drivers/scsi/osd/
 F:     include/scsi/osd_*