Merge branch 'linus' into test

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

diff --git a/MAINTAINERS b/MAINTAINERS
index 5c3f79c26384eba384af07241c71f2cb251abdb5..57ed36d474aa648b6b6592110b2417bb5a5180ca 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1427,8 +1427,8 @@ M:        rdunlap@xenotime.net
 S:     Maintained
 
 DOCKING STATION DRIVER
-P:     Kristen Carlson Accardi
-M:     kristen.c.accardi@intel.com
+P:     Shaohua Li
+M:     shaohua.li@intel.com
 L:     linux-acpi@vger.kernel.org
 S:     Supported
 
@@ -2103,6 +2103,12 @@ L:       linux-ide@vger.kernel.org
 L:     linux-scsi@vger.kernel.org
 S:     Orphan
 
+IDLE-I7300
+P:     Andy Henroid
+M:     andrew.d.henroid@intel.com
+L:     linux-pm@lists.linux-foundation.org
+S:     Supported
+
 IEEE 1394 SUBSYSTEM (drivers/ieee1394)
 P:     Ben Collins
 M:     ben.collins@ubuntu.com
@@ -3173,6 +3179,11 @@ M:       olof@lixom.net
 L:     i2c@lm-sensors.org
 S:     Maintained
 
+PANASONIC LAPTOP ACPI EXTRAS DRIVER
+P:     Harald Welte
+M:     laforge@gnumonks.org
+S:     Maintained
+
 PANASONIC MN10300/AM33 PORT
 P:     David Howells
 M:     dhowells@redhat.com