diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-25 14:10:34 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-25 14:10:34 -0700 |
commit | 750e06992d49666a7589aac555eb3bb68e4dbb88 (patch) | |
tree | 7ee3d85adf256491dae89e5b049bb28ef1a1680c /MAINTAINERS | |
parent | d3ec4844d449cf7af9e749f73ba2052fb7b72fc2 (diff) | |
parent | 156e2d1adc03e17f18f98d297f7757fc6d93a589 (diff) | |
download | linux-3.10-750e06992d49666a7589aac555eb3bb68e4dbb88.tar.gz linux-3.10-750e06992d49666a7589aac555eb3bb68e4dbb88.tar.bz2 linux-3.10-750e06992d49666a7589aac555eb3bb68e4dbb88.zip |
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
hwmon: (lm78) Become the maintainer
hwmon: (lm78) Make ISA interface depend on CONFIG_ISA
hwmon: (lm78) Avoid forward declarations
hwmon: (sht15) Correct a comment mistake
hwmon: (max1111) Avoid extra memory allocations
hwmon: (it87) Add chassis intrusion detection support
hwmon: (via-cputemp) Add VID reporting support
hwmon-vid: Add support for VIA family 6 model D CPU
hwmon: New driver sch5636
hwmon: (sch5627) Factor out some code shared with sch5636 driver
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index efe0a4b0715..91e5cc7db8c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3960,6 +3960,13 @@ L: lm-sensors@lm-sensors.org S: Maintained F: drivers/hwmon/lm73.c +LM78 HARDWARE MONITOR DRIVER +M: Jean Delvare <khali@linux-fr.org> +L: lm-sensors@lm-sensors.org +S: Maintained +F: Documentation/hwmon/lm78 +F: drivers/hwmon/lm78.c + LM83 HARDWARE MONITOR DRIVER M: Jean Delvare <khali@linux-fr.org> L: lm-sensors@lm-sensors.org |