diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-11 14:23:33 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-11 14:23:33 -0400 |
| commit | 4c274fff4fa03cf2509e1b01d3712de6131bfa50 (patch) | |
| tree | 7a1c32af08c3eb559154f2340431b8de178b167b /MAINTAINERS | |
| parent | 474a503d4bf77ae0cbe484dd0842a2648c0b1c28 (diff) | |
| parent | 384e724b6b396de32c1e9cb0b7ccdd011bcc2beb (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: (s3c-hwmon) Disable build for S3C64xx
MAINTAINERS: Fix Riku Voipio's address
hwmon: (asus_atk0110) Enable the EC
hwmon: (asus_atk0110) Refactor the code
hwmon: (sht15) Fix spurious section mismatch warning
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 6141bdff3596..69e31aab1308 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -2065,7 +2065,7 @@ S: Maintained | |||
| 2065 | F: fs/* | 2065 | F: fs/* |
| 2066 | 2066 | ||
| 2067 | FINTEK F75375S HARDWARE MONITOR AND FAN CONTROLLER DRIVER | 2067 | FINTEK F75375S HARDWARE MONITOR AND FAN CONTROLLER DRIVER |
| 2068 | M: Riku Voipio <riku.vipio@iki.fi> | 2068 | M: Riku Voipio <riku.voipio@iki.fi> |
| 2069 | L: lm-sensors@lm-sensors.org | 2069 | L: lm-sensors@lm-sensors.org |
| 2070 | S: Maintained | 2070 | S: Maintained |
| 2071 | F: drivers/hwmon/f75375s.c | 2071 | F: drivers/hwmon/f75375s.c |