Staging: usb-ip: vhci_hdc:Fix the returned error value

[net-next-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 256d72ad8437036e4d88be4e7b0c0c073439628f..64b9e447545c2df6d9056cc5fd66fc360b623df3 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3317,7 +3317,7 @@ S:        Supported
 F:     drivers/net/wireless/mwl8k.c
 
 MARVELL SOC MMC/SD/SDIO CONTROLLER DRIVER
-M:     Nicolas Pitre <nico@cam.org>
+M:     Nicolas Pitre <nico@fluxnic.net>
 S:     Maintained
 
 MARVELL YUKON / SYSKONNECT DRIVER
@@ -4009,6 +4009,14 @@ S:       Maintained
 F:     drivers/block/pktcdvd.c
 F:     include/linux/pktcdvd.h
 
+PMC SIERRA MaxRAID DRIVER
+P:     Anil Ravindranath
+M:     anil_ravindranath@pmc-sierra.com
+L:     linux-scsi@vger.kernel.org
+W:     http://www.pmc-sierra.com/
+S:     Supported
+F:     drivers/scsi/pmcraid.*
+
 POSIX CLOCKS and TIMERS
 M:     Thomas Gleixner <tglx@linutronix.de>
 S:     Supported
@@ -4447,7 +4455,7 @@ F:        drivers/scsi/sg.c
 F:     include/scsi/sg.h
 
 SCSI SUBSYSTEM
-M:     "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
+M:     "James E.J. Bottomley" <James.Bottomley@suse.de>
 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
@@ -4681,7 +4689,7 @@ F:        include/linux/sl?b*.h
 F:     mm/sl?b.c
 
 SMC91x ETHERNET DRIVER
-M:     Nicolas Pitre <nico@cam.org>
+M:     Nicolas Pitre <nico@fluxnic.net>
 S:     Maintained
 F:     drivers/net/smc91x.*