Merge branch 'misc' into release

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

diff --git a/MAINTAINERS b/MAINTAINERS
index 7e6a17e1de097d74c57766192e71ed35e2fe9f1b..dcbc868c2b7f0939f663a08173fb69726287e709 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2185,6 +2185,13 @@ M:       adaplas@gmail.com
 L:     linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
 S:     Maintained
 
+INTEL MENLOW THERMAL DRIVER
+P:     Sujith Thomas
+M:     sujith.thomas@intel.com
+L:     linux-acpi@vger.kernel.org
+W:     http://www.lesswatts.org/projects/acpi/
+S:     Supported
+
 INTEL IA32 MICROCODE UPDATE SUPPORT
 P:     Tigran Aivazian
 M:     tigran@aivazian.fsnet.co.uk
@@ -3346,7 +3353,9 @@ S:        Maintained
 
 PNP SUPPORT
 P:     Adam Belay
-M:     ambx1@neo.rr.com
+M:     abelay@mit.edu
+P:     Bjorn Helgaas
+M:     bjorn.helgaas@hp.com
 S:     Maintained
 
 PNXxxxx I2C DRIVER