Merge branch 'panasonic' into test

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

diff --git a/MAINTAINERS b/MAINTAINERS
index fa3579382ed20fd8b58cf94b77978375aacef791..f9f6d4b75c5ec0d28e24c372c3d987af0ef09904 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1198,9 +1198,7 @@ M:        hpa@zytor.com
 S:     Maintained
 
 CPUSETS
-P:     Paul Jackson
 P:     Paul Menage
-M:     pj@sgi.com
 M:     menage@google.com
 L:     linux-kernel@vger.kernel.org
 W:     http://www.bullopensource.org/cpuset/
@@ -1417,8 +1415,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
 
@@ -1984,7 +1982,7 @@ S:        Maintained
 I2C/SMBUS STUB DRIVER
 P:     Mark M. Hoffman
 M:     mhoffman@lightlink.com
-L:     lm-sensors@lm-sensors.org
+L:     i2c@lm-sensors.org
 S:     Maintained
 
 I2C SUBSYSTEM
@@ -2080,6 +2078,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
@@ -2706,6 +2710,7 @@ MAN-PAGES: MANUAL PAGES FOR LINUX -- Sections 2, 3, 4, 5, and 7
 P:     Michael Kerrisk
 M:     mtk.manpages@gmail.com
 W:     http://www.kernel.org/doc/man-pages
+L:     linux-man@vger.kernel.org
 S:     Supported
 
 MARVELL LIBERTAS WIRELESS DRIVER
@@ -3731,7 +3736,7 @@ S:        Maintained
 SIS 96X I2C/SMBUS DRIVER
 P:     Mark M. Hoffman
 M:     mhoffman@lightlink.com
-L:     lm-sensors@lm-sensors.org
+L:     i2c@lm-sensors.org
 S:     Maintained
 
 SIS FRAMEBUFFER DRIVER
@@ -3838,11 +3843,12 @@ S:      Maintained
 
 SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT
 P:     Liam Girdwood
-M:     liam.girdwood@wolfsonmicro.com
+M:     lrg@slimlogic.co.uk
 P:     Mark Brown
 M:     broonie@opensource.wolfsonmicro.com
 T:     git opensource.wolfsonmicro.com/linux-2.6-asoc
 L:     alsa-devel@alsa-project.org (subscribers-only)
+W:     http://alsa-project.org/main/index.php/ASoC
 S:     Supported
 
 SPI SUBSYSTEM