aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/i2c/busses/i2c-sis69x2
-rw-r--r--Documentation/i2c/porting-clients2
-rw-r--r--MAINTAINERS16
3 files changed, 10 insertions, 10 deletions
diff --git a/Documentation/i2c/busses/i2c-sis69x b/Documentation/i2c/busses/i2c-sis69x
index 5be48769f65b..b88953dfd580 100644
--- a/Documentation/i2c/busses/i2c-sis69x
+++ b/Documentation/i2c/busses/i2c-sis69x
@@ -42,7 +42,7 @@ I suspect that this driver could be made to work for the following SiS
42chipsets as well: 635, and 635T. If anyone owns a board with those chips 42chipsets as well: 635, and 635T. If anyone owns a board with those chips
43AND is willing to risk crashing & burning an otherwise well-behaved kernel 43AND is willing to risk crashing & burning an otherwise well-behaved kernel
44in the name of progress... please contact me at <mhoffman@lightlink.com> or 44in the name of progress... please contact me at <mhoffman@lightlink.com> or
45via the project's mailing list: <sensors@stimpy.netroedge.com>. Please 45via the project's mailing list: <lm-sensors@lm-sensors.org>. Please
46send bug reports and/or success stories as well. 46send bug reports and/or success stories as well.
47 47
48 48
diff --git a/Documentation/i2c/porting-clients b/Documentation/i2c/porting-clients
index 56404918eabc..a7adbdd9ea8a 100644
--- a/Documentation/i2c/porting-clients
+++ b/Documentation/i2c/porting-clients
@@ -57,7 +57,7 @@ Technical changes:
57 Documentation/i2c/sysfs-interface for the individual files. Also 57 Documentation/i2c/sysfs-interface for the individual files. Also
58 convert the units these files read and write to the specified ones. 58 convert the units these files read and write to the specified ones.
59 If you need to add a new type of file, please discuss it on the 59 If you need to add a new type of file, please discuss it on the
60 sensors mailing list <sensors@stimpy.netroedge.com> by providing a 60 sensors mailing list <lm-sensors@lm-sensors.org> by providing a
61 patch to the Documentation/i2c/sysfs-interface file. 61 patch to the Documentation/i2c/sysfs-interface file.
62 62
63* [Attach] For I2C drivers, the attach function should make sure 63* [Attach] For I2C drivers, the attach function should make sure
diff --git a/MAINTAINERS b/MAINTAINERS
index 0f88a70a15d8..4d44824884ef 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -194,7 +194,7 @@ S: Maintained
194ADM1025 HARDWARE MONITOR DRIVER 194ADM1025 HARDWARE MONITOR DRIVER
195P: Jean Delvare 195P: Jean Delvare
196M: khali@linux-fr.org 196M: khali@linux-fr.org
197L: sensors@stimpy.netroedge.com 197L: lm-sensors@lm-sensors.org
198S: Maintained 198S: Maintained
199 199
200ADT746X FAN DRIVER 200ADT746X FAN DRIVER
@@ -242,7 +242,7 @@ S: Maintained
242ALI1563 I2C DRIVER 242ALI1563 I2C DRIVER
243P: Rudolf Marek 243P: Rudolf Marek
244M: r.marek@sh.cvut.cz 244M: r.marek@sh.cvut.cz
245L: sensors@stimpy.netroedge.com 245L: lm-sensors@lm-sensors.org
246S: Maintained 246S: Maintained
247 247
248ALPHA PORT 248ALPHA PORT
@@ -1002,7 +1002,7 @@ P: Greg Kroah-Hartman
1002M: greg@kroah.com 1002M: greg@kroah.com
1003P: Jean Delvare 1003P: Jean Delvare
1004M: khali@linux-fr.org 1004M: khali@linux-fr.org
1005L: sensors@stimpy.netroedge.com 1005L: lm-sensors@lm-sensors.org
1006W: http://www.lm-sensors.nu/ 1006W: http://www.lm-sensors.nu/
1007S: Maintained 1007S: Maintained
1008 1008
@@ -1430,13 +1430,13 @@ S: Supported
1430LM83 HARDWARE MONITOR DRIVER 1430LM83 HARDWARE MONITOR DRIVER
1431P: Jean Delvare 1431P: Jean Delvare
1432M: khali@linux-fr.org 1432M: khali@linux-fr.org
1433L: sensors@stimpy.netroedge.com 1433L: lm-sensors@lm-sensors.org
1434S: Maintained 1434S: Maintained
1435 1435
1436LM90 HARDWARE MONITOR DRIVER 1436LM90 HARDWARE MONITOR DRIVER
1437P: Jean Delvare 1437P: Jean Delvare
1438M: khali@linux-fr.org 1438M: khali@linux-fr.org
1439L: sensors@stimpy.netroedge.com 1439L: lm-sensors@lm-sensors.org
1440S: Maintained 1440S: Maintained
1441 1441
1442LOGICAL DISK MANAGER SUPPORT (LDM, Windows 2000/XP Dynamic Disks) 1442LOGICAL DISK MANAGER SUPPORT (LDM, Windows 2000/XP Dynamic Disks)
@@ -2075,7 +2075,7 @@ S: Maintained
2075SMSC47M1 HARDWARE MONITOR DRIVER 2075SMSC47M1 HARDWARE MONITOR DRIVER
2076P: Jean Delvare 2076P: Jean Delvare
2077M: khali@linux-fr.org 2077M: khali@linux-fr.org
2078L: sensors@stimpy.netroedge.com 2078L: lm-sensors@lm-sensors.org
2079S: Odd Fixes 2079S: Odd Fixes
2080 2080
2081SMB FILESYSTEM 2081SMB FILESYSTEM
@@ -2614,7 +2614,7 @@ S: Orphan
2614W1 DALLAS'S 1-WIRE BUS 2614W1 DALLAS'S 1-WIRE BUS
2615P: Evgeniy Polyakov 2615P: Evgeniy Polyakov
2616M: johnpol@2ka.mipt.ru 2616M: johnpol@2ka.mipt.ru
2617L: sensors@stimpy.netroedge.com 2617L: lm-sensors@lm-sensors.org
2618S: Maintained 2618S: Maintained
2619 2619
2620W83L51xD SD/MMC CARD INTERFACE DRIVER 2620W83L51xD SD/MMC CARD INTERFACE DRIVER
@@ -2627,7 +2627,7 @@ S: Maintained
2627W83L785TS HARDWARE MONITOR DRIVER 2627W83L785TS HARDWARE MONITOR DRIVER
2628P: Jean Delvare 2628P: Jean Delvare
2629M: khali@linux-fr.org 2629M: khali@linux-fr.org
2630L: sensors@stimpy.netroedge.com 2630L: lm-sensors@lm-sensors.org
2631S: Odd Fixes 2631S: Odd Fixes
2632 2632
2633WAN ROUTER & SANGOMA WANPIPE DRIVERS & API (X.25, FRAME RELAY, PPP, CISCO HDLC) 2633WAN ROUTER & SANGOMA WANPIPE DRIVERS & API (X.25, FRAME RELAY, PPP, CISCO HDLC)