Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging

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

+11 -4
+11 -4
MAINTAINERS
··· 2270 2270 F: include/linux/dm-*.h 2271 2271 2272 2272 DIOLAN U2C-12 I2C DRIVER 2273 - M: Guenter Roeck <guenter.roeck@ericsson.com> 2273 + M: Guenter Roeck <linux@roeck-us.net> 2274 2274 L: linux-i2c@vger.kernel.org 2275 2275 S: Maintained 2276 2276 F: drivers/i2c/busses/i2c-diolan-u2c.c ··· 3145 3145 3146 3146 HARDWARE MONITORING 3147 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 3149 L: lm-sensors@lm-sensors.org 3150 3150 W: http://www.lm-sensors.org/ 3151 3151 T: quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-hwmon/ ··· 4420 4420 F: drivers/video/matrox/matroxfb_* 4421 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 4430 MAX6650 HARDWARE MONITOR AND FAN CONTROLLER DRIVER 4424 4431 M: "Hans J. Koch" <hjk@hansjkoch.de> 4425 4432 L: lm-sensors@lm-sensors.org ··· 5165 5158 F: include/linux/leds-pca9532.h 5166 5159 5167 5160 PCA9541 I2C BUS MASTER SELECTOR DRIVER 5168 - M: Guenter Roeck <guenter.roeck@ericsson.com> 5161 + M: Guenter Roeck <linux@roeck-us.net> 5169 5162 L: linux-i2c@vger.kernel.org 5170 5163 S: Maintained 5171 5164 F: drivers/i2c/muxes/i2c-mux-pca9541.c ··· 5315 5308 F: drivers/rtc/rtc-puv3.c 5316 5309 5317 5310 PMBUS HARDWARE MONITORING DRIVERS 5318 - M: Guenter Roeck <guenter.roeck@ericsson.com> 5311 + M: Guenter Roeck <linux@roeck-us.net> 5319 5312 L: lm-sensors@lm-sensors.org 5320 5313 W: http://www.lm-sensors.org/ 5321 5314 W: http://www.roeck-us.net/linux/drivers/