aboutsummaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-10-18 17:52:27 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-18 17:52:27 -0700
commit64d9a39ec9ad074384b548c0cead89265c82e166 (patch)
tree5c0cdd72f41584d33e76e4a3c08eeb1960a0b5c7 /MAINTAINERS
parent17e6c600b2bc4f15dd5f9144ccb8b5c5211dd6e4 (diff)
parentbd452e6f178a559408c54c2b4ca29191b812d47f (diff)
downloadlinux-2.6.38-lt-ux500-64d9a39ec9ad074384b548c0cead89265c82e166.tar.gz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/hwmon-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/hwmon-2.6: hwmon: Fix debug messages in w83781d hwmon: Let w83781d and lm78 load again w83627ehf: Fix the detection of fan5 k8temp: Documentation update smsc47m1: List the SMSC LPC47M112 as supported hwmon: Fix documentation typos adm9240: Update Grant Coady's email address w83791d: Fix unchecked return status
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS6
1 files changed, 6 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 9b6b88268d3..d708702aba2 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1668,6 +1668,12 @@ M: sct@redhat.com, akpm@osdl.org
L: ext2-devel@lists.sourceforge.net
S: Maintained
+K8TEMP HARDWARE MONITORING DRIVER
+P: Rudolf Marek
+M: r.marek@assembler.cz
+L: lm-sensors@lm-sensors.org
+S: Maintained
+
KCONFIG
P: Roman Zippel
M: zippel@linux-m68k.org