diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-30 17:08:40 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-30 17:08:40 -0800 |
| commit | c5d2bc11030568966f04a2af35bacf33d3e37af7 (patch) | |
| tree | 3ecbdea56f5c46ad80dd0486a37e04de6a7cc95c /MAINTAINERS | |
| parent | 8e2a2880a5c67988104b6f2d5fafac7b78687a9d (diff) | |
| parent | ad77c3e1808f07fa70f707b1c92a683b7c7d3f85 (diff) | |
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
hwmon: (w83627ehf) Disable setting DC mode for pwm2, pwm3 on NCT6776F
hwmon: (sht15) fix bad error code
MAINTAINERS: Drop maintainer for MAX1668 hwmon driver
MAINTAINERS: Add hwmon entries for Wolfson
hwmon: (f71805f) Fix clamping of temperature limits
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 2bd630d9a10..6803338dc88 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4281,13 +4281,6 @@ S: Orphan F: drivers/video/matrox/matroxfb_* F: include/linux/matroxfb.h -MAX1668 TEMPERATURE SENSOR DRIVER -M: "David George" <david.george@ska.ac.za> -L: lm-sensors@lm-sensors.org -S: Maintained -F: Documentation/hwmon/max1668 -F: drivers/hwmon/max1668.c - MAX6650 HARDWARE MONITOR AND FAN CONTROLLER DRIVER M: "Hans J. Koch" <hjk@hansjkoch.de> L: lm-sensors@lm-sensors.org @@ -7371,6 +7364,7 @@ S: Supported F: Documentation/hwmon/wm83?? F: arch/arm/mach-s3c64xx/mach-crag6410* F: drivers/leds/leds-wm83*.c +F: drivers/hwmon/wm83??-hwmon.c F: drivers/input/misc/wm831x-on.c F: drivers/input/touchscreen/wm831x-ts.c F: drivers/input/touchscreen/wm97*.c |