aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-05-18 16:56:54 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-05-18 16:56:54 -0400
commit3e5b787ac38575c88ceb20619bcda09cb4c17d8b (patch)
treee1617b8c3fa243d919912bebeca7a89840532d34 /MAINTAINERS
parent026bf9bbcf88f31ea619eb46cf9d62beade00821 (diff)
parent70455e790391dac85d9b483a9e286a40df1ecc7f (diff)
Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
* 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6: i2c/max6875: Really prevent 24RF08 corruption i2c-amd756: Fix functionality flags i2c: Kill the old driver matching scheme i2c: Convert remaining new-style drivers to use module aliasing i2c: Switch pasemi to the new device/driver matching scheme i2c: Clean up Blackfin BF527 I2C device declarations i2c-nforce2: Disable the second SMBus channel on the DFI Lanparty NF4 Expert i2c: New co-maintainer
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS4
1 files changed, 3 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index bc1c0088dc49..c68a1189140c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1940,8 +1940,10 @@ L: lm-sensors@lm-sensors.org
1940S: Maintained 1940S: Maintained
1941 1941
1942I2C SUBSYSTEM 1942I2C SUBSYSTEM
1943P: Jean Delvare 1943P: Jean Delvare (PC drivers, core)
1944M: khali@linux-fr.org 1944M: khali@linux-fr.org
1945P: Ben Dooks (embedded platforms)
1946M: ben-linux@fluff.org
1945L: i2c@lm-sensors.org 1947L: i2c@lm-sensors.org
1946T: quilt http://khali.linux-fr.org/devel/linux-2.6/jdelvare-i2c/ 1948T: quilt http://khali.linux-fr.org/devel/linux-2.6/jdelvare-i2c/
1947S: Maintained 1949S: Maintained