summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-06-25 12:30:21 +0200
committerIngo Molnar <mingo@elte.hu>2008-06-25 12:30:21 +0200
commit8b7ef4ec5b1ac8b6feebf5ae9cda85a7514728f8 (patch)
tree8f1f746f98707fb82bcec281ee8f65216eddae36 /MAINTAINERS
parentx86: unify __set_fixmap, fix (diff)
parentLinux 2.6.26-rc8 (diff)
downloadlinux-8b7ef4ec5b1ac8b6feebf5ae9cda85a7514728f8.tar.xz
linux-8b7ef4ec5b1ac8b6feebf5ae9cda85a7514728f8.zip
Merge branch 'linus' into x86/fixmap
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS6
1 files changed, 3 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index cd587eec9fa7..8f0ec46a7096 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4431,10 +4431,10 @@ M: johnpol@2ka.mipt.ru
S: Maintained
W83791D HARDWARE MONITORING DRIVER
-P: Charles Spirakis
-M: bezaur@gmail.com
+P: Marc Hulsman
+M: m.hulsman@tudelft.nl
L: lm-sensors@lm-sensors.org
-S: Odd Fixes
+S: Maintained
W83793 HARDWARE MONITORING DRIVER
P: Rudolf Marek