diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-29 11:14:58 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-29 11:14:58 -0400 |
| commit | e281e315f438093cbf27b4acdee364e781337a7a (patch) | |
| tree | 4cfb1aa49c638091c3ed6ef7d65b4421dd13ee61 /MAINTAINERS | |
| parent | 49b766ec12650db38e98caafa3cd94e8ff59000c (diff) | |
| parent | 371dc4a6d8c3c74a9a1c74b87c2affb3fcef6500 (diff) | |
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: (it87) Fix VID reading on IT8718F/IT8720F
hwmon: (dme1737) No vid attributes for SCH311x
hwmon: (fschmd) Fix check on unsigned in watchdog_write()
hwmon: (coretemp) Maintainer update
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index ece9f60dc5d5..a1a2aceca5bd 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -1488,6 +1488,7 @@ F: mm/*cgroup* | |||
| 1488 | 1488 | ||
| 1489 | CORETEMP HARDWARE MONITORING DRIVER | 1489 | CORETEMP HARDWARE MONITORING DRIVER |
| 1490 | M: Rudolf Marek <r.marek@assembler.cz> | 1490 | M: Rudolf Marek <r.marek@assembler.cz> |
| 1491 | M: Huaxu Wan <huaxu.wan@intel.com> | ||
| 1491 | L: lm-sensors@lm-sensors.org | 1492 | L: lm-sensors@lm-sensors.org |
| 1492 | S: Maintained | 1493 | S: Maintained |
| 1493 | F: Documentation/hwmon/coretemp | 1494 | F: Documentation/hwmon/coretemp |