diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-17 10:25:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-17 10:25:47 -0700 |
| commit | 509344b8b4d365b7ff3bce97198d83a57b7c3f31 (patch) | |
| tree | b9362ca16a3670a67dcc05fdaf0162aa2e470c5f /MAINTAINERS | |
| parent | 80214df8db6d0ba8172f70122705ef29077fd918 (diff) | |
| parent | bc482bf0ce918b39a1fa60b9341f1add9318d833 (diff) | |
| download | blackbird-op-linux-509344b8b4d365b7ff3bce97198d83a57b7c3f31.tar.gz blackbird-op-linux-509344b8b4d365b7ff3bce97198d83a57b7c3f31.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: (lm95241) Replace rate sysfs attribute with update_interval
hwmon: (adm1031) Replace update_rate sysfs attribute with update_interval
hwmon: (w83627ehf) Use proper exit sequence
hwmon: (emc1403) Remove unnecessary hwmon_device_unregister
hwmon: (f75375s) Do not overwrite values read from registers
hwmon: (f75375s) Shift control mode to the correct bit position
hwmon: New subsystem maintainers
hwmon: (lis3lv02d) Prevent NULL pointer dereference
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index e7c528ff1013..8540dea232af 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2657,9 +2657,12 @@ S: Maintained F: drivers/media/video/gspca/ HARDWARE MONITORING +M: Jean Delvare <khali@linux-fr.org> +M: Guenter Roeck <guenter.roeck@ericsson.com> L: lm-sensors@lm-sensors.org W: http://www.lm-sensors.org/ -S: Orphan +T: quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-hwmon/ +S: Maintained F: Documentation/hwmon/ F: drivers/hwmon/ F: include/linux/hwmon*.h |
