diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-15 14:59:27 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-15 14:59:27 -0500 |
commit | f0a34ac98b3e71879c736fb8a6adc45badcb9f78 (patch) | |
tree | 286e259465ba13aaee0fc98404978dcbf0be6665 | |
parent | 323a72d83c9b2963bd1e46c8e6963e468d4658d7 (diff) | |
parent | 14d77c4ddfd85688014541d33ef53db135503e23 (diff) |
Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c maintainer info update from Wolfram Sang:
"Since my old email and repos are not working anymore, and this already
caused some confusion, I think a MAINTAINERS update for 3.8 is
helpful. So, people trying I2C with the new kernel can properly reach
me and find my repos."
* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
MAINTAINERS: change my email and repos
-rw-r--r-- | MAINTAINERS | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 35a56bcd5e75..3b955649c325 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -1303,7 +1303,7 @@ F: include/linux/dmaengine.h | |||
1303 | F: include/linux/async_tx.h | 1303 | F: include/linux/async_tx.h |
1304 | 1304 | ||
1305 | AT24 EEPROM DRIVER | 1305 | AT24 EEPROM DRIVER |
1306 | M: Wolfram Sang <w.sang@pengutronix.de> | 1306 | M: Wolfram Sang <wsa@the-dreams.de> |
1307 | L: linux-i2c@vger.kernel.org | 1307 | L: linux-i2c@vger.kernel.org |
1308 | S: Maintained | 1308 | S: Maintained |
1309 | F: drivers/misc/eeprom/at24.c | 1309 | F: drivers/misc/eeprom/at24.c |
@@ -3757,12 +3757,11 @@ S: Maintained | |||
3757 | F: drivers/i2c/i2c-stub.c | 3757 | F: drivers/i2c/i2c-stub.c |
3758 | 3758 | ||
3759 | I2C SUBSYSTEM | 3759 | I2C SUBSYSTEM |
3760 | M: Wolfram Sang <w.sang@pengutronix.de> | 3760 | M: Wolfram Sang <wsa@the-dreams.de> |
3761 | M: "Ben Dooks (embedded platforms)" <ben-linux@fluff.org> | 3761 | M: "Ben Dooks (embedded platforms)" <ben-linux@fluff.org> |
3762 | L: linux-i2c@vger.kernel.org | 3762 | L: linux-i2c@vger.kernel.org |
3763 | W: http://i2c.wiki.kernel.org/ | 3763 | W: http://i2c.wiki.kernel.org/ |
3764 | T: quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-i2c/ | 3764 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git |
3765 | T: git git://git.pengutronix.de/git/wsa/linux.git | ||
3766 | S: Maintained | 3765 | S: Maintained |
3767 | F: Documentation/i2c/ | 3766 | F: Documentation/i2c/ |
3768 | F: drivers/i2c/ | 3767 | F: drivers/i2c/ |
@@ -5778,15 +5777,6 @@ L: linux-i2c@vger.kernel.org | |||
5778 | S: Maintained | 5777 | S: Maintained |
5779 | F: drivers/i2c/muxes/i2c-mux-pca9541.c | 5778 | F: drivers/i2c/muxes/i2c-mux-pca9541.c |
5780 | 5779 | ||
5781 | PCA9564/PCA9665 I2C BUS DRIVER | ||
5782 | M: Wolfram Sang <w.sang@pengutronix.de> | ||
5783 | L: linux-i2c@vger.kernel.org | ||
5784 | S: Maintained | ||
5785 | F: drivers/i2c/algos/i2c-algo-pca.c | ||
5786 | F: drivers/i2c/busses/i2c-pca-* | ||
5787 | F: include/linux/i2c-algo-pca.h | ||
5788 | F: include/linux/i2c-pca-platform.h | ||
5789 | |||
5790 | PCDP - PRIMARY CONSOLE AND DEBUG PORT | 5780 | PCDP - PRIMARY CONSOLE AND DEBUG PORT |
5791 | M: Khalid Aziz <khalid@gonehiking.org> | 5781 | M: Khalid Aziz <khalid@gonehiking.org> |
5792 | S: Maintained | 5782 | S: Maintained |