diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-29 16:14:58 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-29 16:14:58 +0100 |
commit | e281e315f438093cbf27b4acdee364e781337a7a (patch) | |
tree | 4cfb1aa49c638091c3ed6ef7d65b4421dd13ee61 /MAINTAINERS | |
parent | Merge branch 'urgent-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/bro... (diff) | |
parent | hwmon: (it87) Fix VID reading on IT8718F/IT8720F (diff) | |
download | linux-e281e315f438093cbf27b4acdee364e781337a7a.tar.xz linux-e281e315f438093cbf27b4acdee364e781337a7a.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: (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* CORETEMP HARDWARE MONITORING DRIVER M: Rudolf Marek <r.marek@assembler.cz> +M: Huaxu Wan <huaxu.wan@intel.com> L: lm-sensors@lm-sensors.org S: Maintained F: Documentation/hwmon/coretemp |