diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-06 11:33:09 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-06 11:33:09 -0800 |
| commit | dff6d1c5ef9116a4478908001d72ee67127ecf01 (patch) | |
| tree | 43c6e7ff8e8059f8fd733efd45b51f84b510d305 /MAINTAINERS | |
| parent | 66ce3cf84deba6cc71dcf43c9d56a4278e5f712d (diff) | |
| parent | a0a5e3488a51c46f383c5faa86b53828e30ce153 (diff) | |
| download | blackbird-op-linux-dff6d1c5ef9116a4478908001d72ee67127ecf01.tar.gz blackbird-op-linux-dff6d1c5ef9116a4478908001d72ee67127ecf01.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: (23 commits)
hwmon: Remove the deprecated adt7473 driver
hwmon: Fix off-by-one kind values
hwmon: (tmp421) Fix temperature conversions
hwmon: (tmp421) Restore missing inputs
hwmon: Driver for Andigilog aSC7621 family monitoring chips
hwmon: (adt7411) Improve locking
hwmon: Add driver for ADT7411 voltage and temperature sensor
hwmon: (w83793) Add watchdog functionality
hwmon: (g760a) Make rpm_from_cnt static
hwmon: (it87) Validate auto pwm settings
hwmon: (it87) Add support for old automatic fan speed control
hwmon: (it87) Drop dead web links in documentation
hwmon: (it87) Add an entry in MAINTAINERS
hwmon: (it87) Use strict_strtol instead of simple_strtol
hwmon: (it87) Fix many checkpatch errors and warnings
hwmon: (it87) Add support for beep on alarm
hwmon: (it87) Create vid attributes by group
hwmon: (it87) Refactor attributes creation and removal
hwmon: (it87) Expose the PWM/temperature mappings
hwmon: (it87) Display fan outputs in automatic mode as such
...
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index e0d5c1a949d9..bfa4fd1f3c03 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -968,6 +968,13 @@ W: http://www.arm.linux.org.uk/ S: Maintained F: arch/arm/vfp/ +ASC7621 HARDWARE MONITOR DRIVER +M: George Joseph <george.joseph@fairview5.com> +L: lm-sensors@lm-sensors.org +S: Maintained +F: Documentation/hwmon/asc7621 +F: drivers/hwmon/asc7621.c + ASUS ACPI EXTRAS DRIVER M: Corentin Chary <corentincj@iksaif.net> M: Karol Kozimor <sziwan@users.sourceforge.net> @@ -3048,6 +3055,13 @@ W: http://www.melware.de S: Maintained F: drivers/isdn/hardware/eicon/ +IT87 HARDWARE MONITORING DRIVER +M: Jean Delvare <khali@linux-fr.org> +L: lm-sensors@lm-sensors.org +S: Maintained +F: Documentation/hwmon/it87 +F: drivers/hwmon/it87.c + IVTV VIDEO4LINUX DRIVER M: Andy Walls <awalls@radix.net> L: ivtv-devel@ivtvdriver.org (moderated for non-subscribers) |
