diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-25 08:41:18 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-25 08:41:18 -0700 |
| commit | 5a559057b4fa0f60b2772fb590bf13e90af7a57d (patch) | |
| tree | 193391b65af88f56ffc440a37cac29f363e79a8c /MAINTAINERS | |
| parent | 5e686019df425a4fd8003ce7f6eaccbe537331d8 (diff) | |
| parent | 968591298514167d05b0379377757ddefc76f022 (diff) | |
| download | lwn-5a559057b4fa0f60b2772fb590bf13e90af7a57d.tar.gz lwn-5a559057b4fa0f60b2772fb590bf13e90af7a57d.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:
MAINTAINERS: hwmon/coretemp: Change maintainers
hwmon: (k8temp) Differentiate between AM2 and ASB1
hwmon: (ads7871) Fix ads7871_probe error paths
hwmon: (coretemp) Fix harmless build warning
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index a1df54b0af79..5fa8451ec80c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1676,8 +1676,7 @@ F: kernel/cgroup* F: mm/*cgroup* CORETEMP HARDWARE MONITORING DRIVER -M: Rudolf Marek <r.marek@assembler.cz> -M: Huaxu Wan <huaxu.wan@intel.com> +M: Fenghua Yu <fenghua.yu@intel.com> L: lm-sensors@lm-sensors.org S: Maintained F: Documentation/hwmon/coretemp |