diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-10 20:09:13 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-10 20:09:13 -0500 |
| commit | 8adbf8d46718a8f110de55ec82c40d04d0c362cc (patch) | |
| tree | dbaf7109edaaa26496e131e6644074fbcb75c75d /MAINTAINERS | |
| parent | 0be8c8bd1de21d75ef14eb6af35b664f70a35746 (diff) | |
| parent | 0cc43a1806f078f7fd414850d8f1f1761696e4af (diff) | |
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-- | MAINTAINERS | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index ad600c54c7bf..bb6c1ac85138 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -2692,6 +2692,14 @@ S: Supported | |||
| 2692 | F: drivers/i2c/busses/i2c-gpio.c | 2692 | F: drivers/i2c/busses/i2c-gpio.c |
| 2693 | F: include/linux/i2c-gpio.h | 2693 | F: include/linux/i2c-gpio.h |
| 2694 | 2694 | ||
| 2695 | GENERIC GPIO I2C MULTIPLEXER DRIVER | ||
| 2696 | M: Peter Korsgaard <peter.korsgaard@barco.com> | ||
| 2697 | L: linux-i2c@vger.kernel.org | ||
| 2698 | S: Supported | ||
| 2699 | F: drivers/i2c/muxes/gpio-i2cmux.c | ||
| 2700 | F: include/linux/gpio-i2cmux.h | ||
| 2701 | F: Documentation/i2c/muxes/gpio-i2cmux | ||
| 2702 | |||
| 2695 | GENERIC HDLC (WAN) DRIVERS | 2703 | GENERIC HDLC (WAN) DRIVERS |
| 2696 | M: Krzysztof Halasa <khc@pm.waw.pl> | 2704 | M: Krzysztof Halasa <khc@pm.waw.pl> |
| 2697 | W: http://www.kernel.org/pub/linux/utils/net/hdlc/ | 2705 | W: http://www.kernel.org/pub/linux/utils/net/hdlc/ |