Commit 71fae7e7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents ff39d0e8 ca462085

MAINTAINERS

+11 −4
Original line number Diff line number Diff line
@@ -2270,7 +2270,7 @@ F: include/linux/device-mapper.h 
F:	include/linux/dm-*.h



DIOLAN U2C-12 I2C DRIVER

M:	Guenter Roeck <guenter.roeck@ericsson.com>

M:	Guenter Roeck <linux@roeck-us.net>

L:	linux-i2c@vger.kernel.org

S:	Maintained

F:	drivers/i2c/busses/i2c-diolan-u2c.c
@@ -3145,7 +3145,7 @@ F: drivers/tty/hvc/ 


HARDWARE MONITORING

M:	Jean Delvare <khali@linux-fr.org>

M:	Guenter Roeck <guenter.roeck@ericsson.com>

M:	Guenter Roeck <linux@roeck-us.net>

L:	lm-sensors@lm-sensors.org

W:	http://www.lm-sensors.org/

T:	quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-hwmon/
@@ -4420,6 +4420,13 @@ S: Orphan 
F:	drivers/video/matrox/matroxfb_*

F:	include/linux/matroxfb.h



MAX16065 HARDWARE MONITOR DRIVER

M:	Guenter Roeck <linux@roeck-us.net>

L:	lm-sensors@lm-sensors.org

S:	Maintained

F:	Documentation/hwmon/max16065

F:	drivers/hwmon/max16065.c



MAX6650 HARDWARE MONITOR AND FAN CONTROLLER DRIVER

M:	"Hans J. Koch" <hjk@hansjkoch.de>

L:	lm-sensors@lm-sensors.org
@@ -5158,7 +5165,7 @@ F: drivers/leds/leds-pca9532.c 
F:	include/linux/leds-pca9532.h



PCA9541 I2C BUS MASTER SELECTOR DRIVER

M:	Guenter Roeck <guenter.roeck@ericsson.com>

M:	Guenter Roeck <linux@roeck-us.net>

L:	linux-i2c@vger.kernel.org

S:	Maintained

F:	drivers/i2c/muxes/i2c-mux-pca9541.c
@@ -5308,7 +5315,7 @@ F: drivers/video/fb-puv3.c 
F:	drivers/rtc/rtc-puv3.c



PMBUS HARDWARE MONITORING DRIVERS

M:	Guenter Roeck <guenter.roeck@ericsson.com>

M:	Guenter Roeck <linux@roeck-us.net>

L:	lm-sensors@lm-sensors.org

W:	http://www.lm-sensors.org/

W:	http://www.roeck-us.net/linux/drivers/