aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/i2c/busses/i2c-sis96x2
-rw-r--r--MAINTAINERS20
2 files changed, 11 insertions, 11 deletions
diff --git a/Documentation/i2c/busses/i2c-sis96x b/Documentation/i2c/busses/i2c-sis96x
index 266481fd26e2..70e6a0cc1e15 100644
--- a/Documentation/i2c/busses/i2c-sis96x
+++ b/Documentation/i2c/busses/i2c-sis96x
@@ -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: <i2c@lm-sensors.org>. Please send bug 45via the linux-i2c mailing list: <linux-i2c@vger.kernel.org>. Please send bug
46reports and/or success stories as well. 46reports and/or success stories as well.
47 47
48 48
diff --git a/MAINTAINERS b/MAINTAINERS
index 16202c8ac68f..0cbfc36499ad 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -347,7 +347,7 @@ S: Maintained
347ALI1563 I2C DRIVER 347ALI1563 I2C DRIVER
348P: Rudolf Marek 348P: Rudolf Marek
349M: r.marek@assembler.cz 349M: r.marek@assembler.cz
350L: i2c@lm-sensors.org 350L: linux-i2c@vger.kernel.org
351S: Maintained 351S: Maintained
352 352
353ALPHA PORT 353ALPHA PORT
@@ -1749,7 +1749,7 @@ FREESCALE I2C CPM DRIVER
1749P: Jochen Friedrich 1749P: Jochen Friedrich
1750M: jochen@scram.de 1750M: jochen@scram.de
1751L: linuxppc-dev@ozlabs.org 1751L: linuxppc-dev@ozlabs.org
1752L: i2c@lm-sensors.org 1752L: linux-i2c@vger.kernel.org
1753S: Maintained 1753S: Maintained
1754 1754
1755FREESCALE SOC FS_ENET DRIVER 1755FREESCALE SOC FS_ENET DRIVER
@@ -2022,7 +2022,7 @@ S: Maintained
2022I2C/SMBUS STUB DRIVER 2022I2C/SMBUS STUB DRIVER
2023P: Mark M. Hoffman 2023P: Mark M. Hoffman
2024M: mhoffman@lightlink.com 2024M: mhoffman@lightlink.com
2025L: i2c@lm-sensors.org 2025L: linux-i2c@vger.kernel.org
2026S: Maintained 2026S: Maintained
2027 2027
2028I2C SUBSYSTEM 2028I2C SUBSYSTEM
@@ -2030,14 +2030,14 @@ P: Jean Delvare (PC drivers, core)
2030M: khali@linux-fr.org 2030M: khali@linux-fr.org
2031P: Ben Dooks (embedded platforms) 2031P: Ben Dooks (embedded platforms)
2032M: ben-linux@fluff.org 2032M: ben-linux@fluff.org
2033L: i2c@lm-sensors.org 2033L: linux-i2c@vger.kernel.org
2034T: quilt http://khali.linux-fr.org/devel/linux-2.6/jdelvare-i2c/ 2034T: quilt http://khali.linux-fr.org/devel/linux-2.6/jdelvare-i2c/
2035S: Maintained 2035S: Maintained
2036 2036
2037I2C-TINY-USB DRIVER 2037I2C-TINY-USB DRIVER
2038P: Till Harbaum 2038P: Till Harbaum
2039M: till@harbaum.org 2039M: till@harbaum.org
2040L: i2c@lm-sensors.org 2040L: linux-i2c@vger.kernel.org
2041T: http://www.harbaum.org/till/i2c_tiny_usb 2041T: http://www.harbaum.org/till/i2c_tiny_usb
2042S: Maintained 2042S: Maintained
2043 2043
@@ -3143,7 +3143,7 @@ S: Maintained
3143OPENCORES I2C BUS DRIVER 3143OPENCORES I2C BUS DRIVER
3144P: Peter Korsgaard 3144P: Peter Korsgaard
3145M: jacmet@sunsite.dk 3145M: jacmet@sunsite.dk
3146L: i2c@lm-sensors.org 3146L: linux-i2c@vger.kernel.org
3147S: Maintained 3147S: Maintained
3148 3148
3149OPROFILE 3149OPROFILE
@@ -3190,7 +3190,7 @@ S: Maintained
3190PA SEMI SMBUS DRIVER 3190PA SEMI SMBUS DRIVER
3191P: Olof Johansson 3191P: Olof Johansson
3192M: olof@lixom.net 3192M: olof@lixom.net
3193L: i2c@lm-sensors.org 3193L: linux-i2c@vger.kernel.org
3194S: Maintained 3194S: Maintained
3195 3195
3196PANASONIC LAPTOP ACPI EXTRAS DRIVER 3196PANASONIC LAPTOP ACPI EXTRAS DRIVER
@@ -3335,7 +3335,7 @@ S: Maintained
3335PNXxxxx I2C DRIVER 3335PNXxxxx I2C DRIVER
3336P: Vitaly Wool 3336P: Vitaly Wool
3337M: vitalywool@gmail.com 3337M: vitalywool@gmail.com
3338L: i2c@lm-sensors.org 3338L: linux-i2c@vger.kernel.org
3339S: Maintained 3339S: Maintained
3340 3340
3341PPP PROTOCOL DRIVERS AND COMPRESSORS 3341PPP PROTOCOL DRIVERS AND COMPRESSORS
@@ -3799,7 +3799,7 @@ S: Maintained
3799SIS 96X I2C/SMBUS DRIVER 3799SIS 96X I2C/SMBUS DRIVER
3800P: Mark M. Hoffman 3800P: Mark M. Hoffman
3801M: mhoffman@lightlink.com 3801M: mhoffman@lightlink.com
3802L: i2c@lm-sensors.org 3802L: linux-i2c@vger.kernel.org
3803S: Maintained 3803S: Maintained
3804 3804
3805SIS FRAMEBUFFER DRIVER 3805SIS FRAMEBUFFER DRIVER
@@ -4546,7 +4546,7 @@ S: Maintained
4546VIAPRO SMBUS DRIVER 4546VIAPRO SMBUS DRIVER
4547P: Jean Delvare 4547P: Jean Delvare
4548M: khali@linux-fr.org 4548M: khali@linux-fr.org
4549L: i2c@lm-sensors.org 4549L: linux-i2c@vger.kernel.org
4550S: Maintained 4550S: Maintained
4551 4551
4552VIA UNICHROME(PRO)/CHROME9 FRAMEBUFFER DRIVER 4552VIA UNICHROME(PRO)/CHROME9 FRAMEBUFFER DRIVER