projects/linux·commit 71fae7e7

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

71fae7e7 · Linus Torvalds <[email protected]> · 2012-06-06 11:56:45 -07:00

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
Commit
71fae7e714749a52cb8be777ec014f82e8a747f4
Parents
ff39d0e8 · ca462085

Merge commit. Changes below are compared with the first parent: ff39d0e8.

Changes

1 files changed · +11 −4

FileStatusAddDelContent
MAINTAINERSmodified+11−4View file

MAINTAINERS

View file
diff --git a/MAINTAINERS b/MAINTAINERS
index f935a0c..dafcba7 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2270,7 +2270,7 @@ F: include/linux/device-mapper.h
F: include/linux/dm-*.h
DIOLAN U2C-12 I2C DRIVER
-M: Guenter Roeck <[email protected]>
+M: Guenter Roeck <[email protected]>
L: [email protected]
S: Maintained
F: drivers/i2c/busses/i2c-diolan-u2c.c
@@ -3145,7 +3145,7 @@ F: drivers/tty/hvc/
HARDWARE MONITORING
M: Jean Delvare <[email protected]>
-M: Guenter Roeck <[email protected]>
+M: Guenter Roeck <[email protected]>
L: [email protected]
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 <[email protected]>
+L: [email protected]
+S: Maintained
+F: Documentation/hwmon/max16065
+F: drivers/hwmon/max16065.c
+
MAX6650 HARDWARE MONITOR AND FAN CONTROLLER DRIVER
M: "Hans J. Koch" <[email protected]>
L: [email protected]
@@ -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 <[email protected]>
+M: Guenter Roeck <[email protected]>
L: [email protected]
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 <[email protected]>
+M: Guenter Roeck <[email protected]>
L: [email protected]
W: http://www.lm-sensors.org/
W: http://www.roeck-us.net/linux/drivers/