aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-01-26 18:11:41 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2009-01-26 18:11:41 -0500
commitcfb901bf84fe22eb86525e9fb20675b53fb0462a (patch)
treee1e710df2c1ba0da26b12f7487fdac6cedc7e166 /MAINTAINERS
parent2034563ca323ee45f37a32911550d21c1f1e9626 (diff)
parent5fb4523afbffae5a5cec4989ee4c9fbc3dbdef33 (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: Warn on deprecated binding model use eeprom: More consistent symbol names eeprom: Move 93cx6 eeprom driver to /drivers/misc/eeprom spi: Move at25 (for SPI eeproms) to /drivers/misc/eeprom i2c: Move old eeprom driver to /drivers/misc/eeprom i2c: Move at24 to drivers/misc/eeprom i2c: Quilt tree has moved i2c: Delete many unused adapter IDs i2c: Delete 10 unused driver IDs
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS3
1 files changed, 2 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 3fe4dc2c2564..d992d407197b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2102,7 +2102,8 @@ M: khali@linux-fr.org
2102P: Ben Dooks (embedded platforms) 2102P: Ben Dooks (embedded platforms)
2103M: ben-linux@fluff.org 2103M: ben-linux@fluff.org
2104L: linux-i2c@vger.kernel.org 2104L: linux-i2c@vger.kernel.org
2105T: quilt http://khali.linux-fr.org/devel/linux-2.6/jdelvare-i2c/ 2105W: http://i2c.wiki.kernel.org/
2106T: quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-i2c/
2106S: Maintained 2107S: Maintained
2107 2108
2108I2C-TINY-USB DRIVER 2109I2C-TINY-USB DRIVER