aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-02-15 14:59:27 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2013-02-15 14:59:27 -0500
commitf0a34ac98b3e71879c736fb8a6adc45badcb9f78 (patch)
tree286e259465ba13aaee0fc98404978dcbf0be6665
parent323a72d83c9b2963bd1e46c8e6963e468d4658d7 (diff)
parent14d77c4ddfd85688014541d33ef53db135503e23 (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--MAINTAINERS16
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
1303F: include/linux/async_tx.h 1303F: include/linux/async_tx.h
1304 1304
1305AT24 EEPROM DRIVER 1305AT24 EEPROM DRIVER
1306M: Wolfram Sang <w.sang@pengutronix.de> 1306M: Wolfram Sang <wsa@the-dreams.de>
1307L: linux-i2c@vger.kernel.org 1307L: linux-i2c@vger.kernel.org
1308S: Maintained 1308S: Maintained
1309F: drivers/misc/eeprom/at24.c 1309F: drivers/misc/eeprom/at24.c
@@ -3757,12 +3757,11 @@ S: Maintained
3757F: drivers/i2c/i2c-stub.c 3757F: drivers/i2c/i2c-stub.c
3758 3758
3759I2C SUBSYSTEM 3759I2C SUBSYSTEM
3760M: Wolfram Sang <w.sang@pengutronix.de> 3760M: Wolfram Sang <wsa@the-dreams.de>
3761M: "Ben Dooks (embedded platforms)" <ben-linux@fluff.org> 3761M: "Ben Dooks (embedded platforms)" <ben-linux@fluff.org>
3762L: linux-i2c@vger.kernel.org 3762L: linux-i2c@vger.kernel.org
3763W: http://i2c.wiki.kernel.org/ 3763W: http://i2c.wiki.kernel.org/
3764T: quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-i2c/ 3764T: git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git
3765T: git git://git.pengutronix.de/git/wsa/linux.git
3766S: Maintained 3765S: Maintained
3767F: Documentation/i2c/ 3766F: Documentation/i2c/
3768F: drivers/i2c/ 3767F: drivers/i2c/
@@ -5778,15 +5777,6 @@ L: linux-i2c@vger.kernel.org
5778S: Maintained 5777S: Maintained
5779F: drivers/i2c/muxes/i2c-mux-pca9541.c 5778F: drivers/i2c/muxes/i2c-mux-pca9541.c
5780 5779
5781PCA9564/PCA9665 I2C BUS DRIVER
5782M: Wolfram Sang <w.sang@pengutronix.de>
5783L: linux-i2c@vger.kernel.org
5784S: Maintained
5785F: drivers/i2c/algos/i2c-algo-pca.c
5786F: drivers/i2c/busses/i2c-pca-*
5787F: include/linux/i2c-algo-pca.h
5788F: include/linux/i2c-pca-platform.h
5789
5790PCDP - PRIMARY CONSOLE AND DEBUG PORT 5780PCDP - PRIMARY CONSOLE AND DEBUG PORT
5791M: Khalid Aziz <khalid@gonehiking.org> 5781M: Khalid Aziz <khalid@gonehiking.org>
5792S: Maintained 5782S: Maintained