Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...

[pandora-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 13902cb..db09036 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -406,14 +406,14 @@ S:        Maintained
 
 ARM/S3C2410 ARM ARCHITECTURE
 P:     Ben Dooks
-M:     ben-s3c2410@fluff.org
+M:     ben-linux@fluff.org
 L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 W:     http://www.fluff.org/ben/linux/
 S:     Maintained
 
 ARM/S3C2440 ARM ARCHITECTURE
 P:     Ben Dooks
-M:     ben-s3c2440@fluff.org
+M:     ben-linux@fluff.org
 L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 W:     http://www.fluff.org/ben/linux/
 S:     Maintained
@@ -943,11 +943,8 @@ L: linux-kernel@vger.kernel.org
 S:     Maintained
 
 DOCBOOK FOR DOCUMENTATION
-P:     Martin Waitz
-M:     tali@admingilde.org
 P:     Randy Dunlap
 M:     rdunlap@xenotime.net
-T:     git http://tali.admingilde.org/git/linux-docbook.git
 S:     Maintained
 
 DOCKING STATION DRIVER
@@ -1403,6 +1400,15 @@ W:       http://www.ia64-linux.org/
 T:     git kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6.git
 S:     Maintained
 
+IBM ACPI EXTRAS DRIVER
+P:     Henrique de Moraes Holschuh
+M:     ibm-acpi@hmh.eng.br
+L:     ibm-acpi-devel@lists.sourceforge.net
+W:     http://ibm-acpi.sourceforge.net
+W:     http://thinkwiki.org/wiki/Ibm-acpi
+T:     git repo.or.cz/linux-2.6/linux-acpi-2.6/ibm-acpi-2.6.git
+S:     Maintained
+
 SN-IA64 (Itanium) SUB-PLATFORM
 P:     Jes Sorensen
 M:     jes@sgi.com