Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6

[pandora-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 38df725..dea5b2a 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -277,7 +277,7 @@ S:  Maintained
 
 ALI1563 I2C DRIVER
 P:     Rudolf Marek
-M:     r.marek@sh.cvut.cz
+M:     r.marek@assembler.cz
 L:     i2c@lm-sensors.org
 S:     Maintained
 
@@ -296,6 +296,13 @@ L: info-linux@geode.amd.com
 W:     http://www.amd.com/us-en/ConnectivitySolutions/TechnicalResources/0,,50_2334_2452_11363,00.html
 S:     Supported
 
+AMS (Apple Motion Sensor) DRIVER
+P:     Stelian Pop
+M:     stelian@popies.net
+P:     Michael Hanselmann
+M:     linux-kernel@hansmi.ch
+S:     Supported
+
 AMSO1100 RNIC DRIVER
 P:     Tom Tucker
 M:     tom@opengridcomputing.com
@@ -3436,6 +3443,12 @@ M:       bezaur@gmail.com
 L:     lm-sensors@lm-sensors.org
 S:     Maintained
 
+W83793 HARDWARE MONITORING DRIVER
+P:     Rudolf Marek
+M:     r.marek@assembler.cz
+L:     lm-sensors@lm-sensors.org
+S:     Maintained
+
 W83L51xD SD/MMC CARD INTERFACE DRIVER
 P:     Pierre Ossman
 M:     drzeus-wbsd@drzeus.cx