diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-29 18:56:27 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-29 18:56:27 -0800 |
commit | 9076e0cae70c5d6ddb9a0284a20885b2b8814416 (patch) | |
tree | 1b30be795ac206c48e59738cc57a71a393bf7337 /MAINTAINERS | |
parent | b7a8399edfd7ad3da36d51513ea30a4708b02b52 (diff) | |
parent | 7c81c60f3789a082e141d7a013392af5f78db16a (diff) | |
download | talos-op-linux-9076e0cae70c5d6ddb9a0284a20885b2b8814416.tar.gz talos-op-linux-9076e0cae70c5d6ddb9a0284a20885b2b8814416.zip |
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
Pull hwmon updates from Jean Delvare:
"This include it87 driver improvements, and a tree-wide change of my
e-mail address"
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
Update Jean Delvare's e-mail address
hwmon: (it87) Print proper names for the IT8771E and IT8772E
hwmon: (it87) Add support for the ITE IT8603E
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 38b81df6701c..a31a6e3e199f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -347,7 +347,7 @@ M: Jiri Kosina <jkosina@suse.cz> S: Maintained ADM1025 HARDWARE MONITOR DRIVER -M: Jean Delvare <khali@linux-fr.org> +M: Jean Delvare <jdelvare@suse.de> L: lm-sensors@lm-sensors.org S: Maintained F: Documentation/hwmon/adm1025 @@ -412,7 +412,7 @@ S: Maintained F: drivers/macintosh/therm_adt746x.c ADT7475 HARDWARE MONITOR DRIVER -M: Jean Delvare <khali@linux-fr.org> +M: Jean Delvare <jdelvare@suse.de> L: lm-sensors@lm-sensors.org S: Maintained F: Documentation/hwmon/adt7475 @@ -3387,7 +3387,7 @@ F: drivers/video/exynos/exynos_mipi* F: include/video/exynos_mipi* F71805F HARDWARE MONITORING DRIVER -M: Jean Delvare <khali@linux-fr.org> +M: Jean Delvare <jdelvare@suse.de> L: lm-sensors@lm-sensors.org S: Maintained F: Documentation/hwmon/f71805f @@ -3914,7 +3914,7 @@ S: Odd Fixes F: drivers/tty/hvc/ HARDWARE MONITORING -M: Jean Delvare <khali@linux-fr.org> +M: Jean Delvare <jdelvare@suse.de> M: Guenter Roeck <linux@roeck-us.net> L: lm-sensors@lm-sensors.org W: http://www.lm-sensors.org/ @@ -4142,7 +4142,7 @@ F: include/linux/hyperv.h F: tools/hv/ I2C OVER PARALLEL PORT -M: Jean Delvare <khali@linux-fr.org> +M: Jean Delvare <jdelvare@suse.de> L: linux-i2c@vger.kernel.org S: Maintained F: Documentation/i2c/busses/i2c-parport @@ -4151,7 +4151,7 @@ F: drivers/i2c/busses/i2c-parport.c F: drivers/i2c/busses/i2c-parport-light.c I2C/SMBUS CONTROLLER DRIVERS FOR PC -M: Jean Delvare <khali@linux-fr.org> +M: Jean Delvare <jdelvare@suse.de> L: linux-i2c@vger.kernel.org S: Maintained F: Documentation/i2c/busses/i2c-ali1535 @@ -4192,7 +4192,7 @@ F: drivers/i2c/busses/i2c-ismt.c F: Documentation/i2c/busses/i2c-ismt I2C/SMBUS STUB DRIVER -M: Jean Delvare <khali@linux-fr.org> +M: Jean Delvare <jdelvare@suse.de> L: linux-i2c@vger.kernel.org S: Maintained F: drivers/i2c/i2c-stub.c @@ -4211,7 +4211,7 @@ F: include/uapi/linux/i2c.h F: include/uapi/linux/i2c-*.h I2C-TAOS-EVM DRIVER -M: Jean Delvare <khali@linux-fr.org> +M: Jean Delvare <jdelvare@suse.de> L: linux-i2c@vger.kernel.org S: Maintained F: Documentation/i2c/busses/i2c-taos-evm @@ -4768,7 +4768,7 @@ S: Maintained F: drivers/isdn/hardware/eicon/ IT87 HARDWARE MONITORING DRIVER -M: Jean Delvare <khali@linux-fr.org> +M: Jean Delvare <jdelvare@suse.de> L: lm-sensors@lm-sensors.org S: Maintained F: Documentation/hwmon/it87 @@ -5138,7 +5138,7 @@ F: drivers/leds/ F: include/linux/leds.h LEGACY EEPROM DRIVER -M: Jean Delvare <khali@linux-fr.org> +M: Jean Delvare <jdelvare@suse.de> S: Maintained F: Documentation/misc-devices/eeprom F: drivers/misc/eeprom/eeprom.c @@ -5286,21 +5286,21 @@ S: Maintained F: drivers/hwmon/lm73.c LM78 HARDWARE MONITOR DRIVER -M: Jean Delvare <khali@linux-fr.org> +M: Jean Delvare <jdelvare@suse.de> L: lm-sensors@lm-sensors.org S: Maintained F: Documentation/hwmon/lm78 F: drivers/hwmon/lm78.c LM83 HARDWARE MONITOR DRIVER -M: Jean Delvare <khali@linux-fr.org> +M: Jean Delvare <jdelvare@suse.de> L: lm-sensors@lm-sensors.org S: Maintained F: Documentation/hwmon/lm83 F: drivers/hwmon/lm83.c LM90 HARDWARE MONITOR DRIVER -M: Jean Delvare <khali@linux-fr.org> +M: Jean Delvare <jdelvare@suse.de> L: lm-sensors@lm-sensors.org S: Maintained F: Documentation/hwmon/lm90 @@ -6493,7 +6493,7 @@ S: Maintained F: drivers/char/pc8736x_gpio.c PC87427 HARDWARE MONITORING DRIVER -M: Jean Delvare <khali@linux-fr.org> +M: Jean Delvare <jdelvare@suse.de> L: lm-sensors@lm-sensors.org S: Maintained F: Documentation/hwmon/pc87427 @@ -7943,7 +7943,7 @@ F: Documentation/hwmon/sch5627 F: drivers/hwmon/sch5627.c SMSC47B397 HARDWARE MONITOR DRIVER -M: Jean Delvare <khali@linux-fr.org> +M: Jean Delvare <jdelvare@suse.de> L: lm-sensors@lm-sensors.org S: Maintained F: Documentation/hwmon/smsc47b397 @@ -9461,7 +9461,7 @@ F: Documentation/hwmon/w83793 F: drivers/hwmon/w83793.c W83795 HARDWARE MONITORING DRIVER -M: Jean Delvare <khali@linux-fr.org> +M: Jean Delvare <jdelvare@suse.de> L: lm-sensors@lm-sensors.org S: Maintained F: drivers/hwmon/w83795.c |