aboutsummaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-01-10 17:09:13 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-01-10 17:09:13 -0800
commit8adbf8d46718a8f110de55ec82c40d04d0c362cc (patch)
treedbaf7109edaaa26496e131e6644074fbcb75c75d /MAINTAINERS
parent0be8c8bd1de21d75ef14eb6af35b664f70a35746 (diff)
parent0cc43a1806f078f7fd414850d8f1f1761696e4af (diff)
downloadlinux-2.6.38-lt-ux500-8adbf8d46718a8f110de55ec82c40d04d0c362cc.tar.gz
Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
* 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging: i2c: Constify i2c_client where possible i2c-algo-bit: Complain about masters which can't read SCL i2c-algo-bit: Refactor adapter registration i2c: Add generic I2C multiplexer using GPIO API i2c-nforce2: Remove unnecessary cast of pci_get_drvdata i2c-i801: Include <linux/slab.h>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS8
1 files changed, 8 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index ad600c54c7b..bb6c1ac8513 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2692,6 +2692,14 @@ S: Supported
F: drivers/i2c/busses/i2c-gpio.c
F: include/linux/i2c-gpio.h
+GENERIC GPIO I2C MULTIPLEXER DRIVER
+M: Peter Korsgaard <peter.korsgaard@barco.com>
+L: linux-i2c@vger.kernel.org
+S: Supported
+F: drivers/i2c/muxes/gpio-i2cmux.c
+F: include/linux/gpio-i2cmux.h
+F: Documentation/i2c/muxes/gpio-i2cmux
+
GENERIC HDLC (WAN) DRIVERS
M: Krzysztof Halasa <khc@pm.waw.pl>
W: http://www.kernel.org/pub/linux/utils/net/hdlc/