Pull hwmon fix from Guenter Roeck: "Update e-mail address in MAINTAINERS" * tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: MAINTAINERS: Update my e-mail address
Unified · Split
| @@ -2270,7 +2270,7 @@ F: include/linux/device-mapper.h · 2269 unmodified lines | |||
| 2270 | F: include/linux/dm-*.h | 2270 | F: include/linux/dm-*.h |
| 2271 | 2271 | ||
| 2272 | DIOLAN U2C-12 I2C DRIVER | 2272 | DIOLAN U2C-12 I2C DRIVER |
| 2273 | M: Guenter Roeck <guenter.roeck@ericsson.com> | 2273 | M: Guenter Roeck <linux@roeck-us.net> |
| 2274 | L: linux-i2c@vger.kernel.org | 2274 | L: linux-i2c@vger.kernel.org |
| 2275 | S: Maintained | 2275 | S: Maintained |
| 2276 | F: drivers/i2c/busses/i2c-diolan-u2c.c | 2276 | F: drivers/i2c/busses/i2c-diolan-u2c.c |
| @@ -3145,7 +3145,7 @@ F: drivers/tty/hvc/ · 868 unmodified lines | |||
| 3145 | 3145 | ||
| 3146 | HARDWARE MONITORING | 3146 | HARDWARE MONITORING |
| 3147 | M: Jean Delvare <khali@linux-fr.org> | 3147 | M: Jean Delvare <khali@linux-fr.org> |
| 3148 | M: Guenter Roeck <guenter.roeck@ericsson.com> | 3148 | M: Guenter Roeck <linux@roeck-us.net> |
| 3149 | L: lm-sensors@lm-sensors.org | 3149 | L: lm-sensors@lm-sensors.org |
| 3150 | W: http://www.lm-sensors.org/ | 3150 | W: http://www.lm-sensors.org/ |
| 3151 | T: quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-hwmon/ | 3151 | T: quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-hwmon/ |
| @@ -4420,6 +4420,13 @@ S: Orphan · 1268 unmodified lines | |||
| 4420 | F: drivers/video/matrox/matroxfb_* | 4420 | F: drivers/video/matrox/matroxfb_* |
| 4421 | F: include/linux/matroxfb.h | 4421 | F: include/linux/matroxfb.h |
| 4422 | 4422 | ||
| 4423 | MAX16065 HARDWARE MONITOR DRIVER | ||
| 4424 | M: Guenter Roeck <linux@roeck-us.net> | ||
| 4425 | L: lm-sensors@lm-sensors.org | ||
| 4426 | S: Maintained | ||
| 4427 | F: Documentation/hwmon/max16065 | ||
| 4428 | F: drivers/hwmon/max16065.c | ||
| 4429 | |||
| 4423 | MAX6650 HARDWARE MONITOR AND FAN CONTROLLER DRIVER | 4430 | MAX6650 HARDWARE MONITOR AND FAN CONTROLLER DRIVER |
| 4424 | M: "Hans J. Koch" <hjk@hansjkoch.de> | 4431 | M: "Hans J. Koch" <hjk@hansjkoch.de> |
| 4425 | L: lm-sensors@lm-sensors.org | 4432 | L: lm-sensors@lm-sensors.org |
| @@ -5158,7 +5165,7 @@ F: drivers/leds/leds-pca9532.c · 732 unmodified lines | |||
| 5158 | F: include/linux/leds-pca9532.h | 5165 | F: include/linux/leds-pca9532.h |
| 5159 | 5166 | ||
| 5160 | PCA9541 I2C BUS MASTER SELECTOR DRIVER | 5167 | PCA9541 I2C BUS MASTER SELECTOR DRIVER |
| 5161 | M: Guenter Roeck <guenter.roeck@ericsson.com> | 5168 | M: Guenter Roeck <linux@roeck-us.net> |
| 5162 | L: linux-i2c@vger.kernel.org | 5169 | L: linux-i2c@vger.kernel.org |
| 5163 | S: Maintained | 5170 | S: Maintained |
| 5164 | F: drivers/i2c/muxes/i2c-mux-pca9541.c | 5171 | F: drivers/i2c/muxes/i2c-mux-pca9541.c |
| @@ -5308,7 +5315,7 @@ F: drivers/video/fb-puv3.c · 143 unmodified lines | |||
| 5308 | F: drivers/rtc/rtc-puv3.c | 5315 | F: drivers/rtc/rtc-puv3.c |
| 5309 | 5316 | ||
| 5310 | PMBUS HARDWARE MONITORING DRIVERS | 5317 | PMBUS HARDWARE MONITORING DRIVERS |
| 5311 | M: Guenter Roeck <guenter.roeck@ericsson.com> | 5318 | M: Guenter Roeck <linux@roeck-us.net> |
| 5312 | L: lm-sensors@lm-sensors.org | 5319 | L: lm-sensors@lm-sensors.org |
| 5313 | W: http://www.lm-sensors.org/ | 5320 | W: http://www.lm-sensors.org/ |
| 5314 | W: http://www.roeck-us.net/linux/drivers/ | 5321 | W: http://www.roeck-us.net/linux/drivers/ |