summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-06-21 12:31:02 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-06-21 12:31:32 -0700
commitbec95aab8c056ab490fe7fa54da822938562443d (patch)
tree597856476547811928a6d053f9e050045c613d38 /MAINTAINERS
parent71c2742f5e6348d76ee62085cf0a13e5eff0f00e (diff)
parentbcccc3a28e9cbb44549cde326852c26203a53a56 (diff)
downloadlinux-stable-bec95aab8c056ab490fe7fa54da822938562443d.tar.gz
linux-stable-bec95aab8c056ab490fe7fa54da822938562443d.tar.bz2
linux-stable-bec95aab8c056ab490fe7fa54da822938562443d.zip
Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6
* 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6: hwmon: (lm75) sensor reading bugfix hwmon: (abituguru3) update driver detection hwmon: (w83791d) new maintainer hwmon: (abituguru3) Identify Abit AW8D board as such hwmon: Update the sysfs interface documentation hwmon: (adt7473) Initialize max_duty_at_overheat before use hwmon: (lm85) Fix function RANGE_TO_REG()
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