Merge branch 'linus' into release

[linux-2.6-omap-h63xx.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 6360b9b9bbbda557860ac202de5cb62cd244c43a..446821b9fac9105bdd548e1c8846d92a63ccdb6f 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1422,6 +1422,11 @@ P:       Doug Warzecha
 M:     Douglas_Warzecha@dell.com
 S:     Maintained
 
+DELL WMI EXTRAS DRIVER
+P:     Matthew Garrett
+M:     mjg59@srcf.ucam.org
+S:     Maintained
+
 DEVICE NUMBER REGISTRY
 P:     Torben Mathiasen
 M:     device@lanana.org
@@ -4382,10 +4387,7 @@ T:       quilt http://svn.sourceforge.jp/svnroot/tomoyo/trunk/2.2.x/tomoyo-lsm/patches
 S:     Maintained
 
 TOSHIBA ACPI EXTRAS DRIVER
-P:     John Belmonte
-M:     toshiba_acpi@memebeam.org
-W:     http://memebeam.org/toys/ToshibaAcpiDriver
-S:     Maintained
+S:     Orphan
 
 TOSHIBA SMM DRIVER
 P:     Jonathan Buzzard