Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

[linux-2.6] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 25af17830522eaca48211dc63b6f1ae374816574..4fc5f0aee6a6c5254afe1ce79f6b5a45b9ce2071 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1712,9 +1712,7 @@ T:        git lm-sensors.org:/kernel/mhoffman/hwmon-2.6.git release
 S:     Maintained
 
 HARDWARE RANDOM NUMBER GENERATOR CORE
-P:     Michael Buesch
-M:     mb@bu3sch.de
-S:     Maintained
+S:     Orphaned
 
 HARD DRIVE ACTIVE PROTECTION SYSTEM (HDAPS) DRIVER
 P:     Robert Love
@@ -2746,6 +2744,8 @@ S:        Maintained
 NETEFFECT IWARP RNIC DRIVER (IW_NES)
 P:     Faisal Latif
 M:     flatif@neteffect.com
+P:     Nishi Gupta
+M:     ngupta@neteffect.com
 P:     Glenn Streiff
 M:     gstreiff@neteffect.com
 L:     general@lists.openfabrics.org