Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelv...
[linux-2.6.git] / MAINTAINERS
index e0d5c1a..bfa4fd1 100644 (file)
@@ -968,6 +968,13 @@ W: http://www.arm.linux.org.uk/
 S:     Maintained
 F:     arch/arm/vfp/
 
+ASC7621 HARDWARE MONITOR DRIVER
+M:     George Joseph <george.joseph@fairview5.com>
+L:     lm-sensors@lm-sensors.org
+S:     Maintained
+F:     Documentation/hwmon/asc7621
+F:     drivers/hwmon/asc7621.c
+
 ASUS ACPI EXTRAS DRIVER
 M:     Corentin Chary <corentincj@iksaif.net>
 M:     Karol Kozimor <sziwan@users.sourceforge.net>
@@ -3048,6 +3055,13 @@ W:       http://www.melware.de
 S:     Maintained
 F:     drivers/isdn/hardware/eicon/
 
+IT87 HARDWARE MONITORING DRIVER
+M:     Jean Delvare <khali@linux-fr.org>
+L:     lm-sensors@lm-sensors.org
+S:     Maintained
+F:     Documentation/hwmon/it87
+F:     drivers/hwmon/it87.c
+
 IVTV VIDEO4LINUX DRIVER
 M:     Andy Walls <awalls@radix.net>
 L:     ivtv-devel@ivtvdriver.org (moderated for non-subscribers)