Commit f0a34ac9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 323a72d8 14d77c4d

MAINTAINERS

+3 −13
Original line number Diff line number Diff line
@@ -1303,7 +1303,7 @@ F: include/linux/dmaengine.h 
F:	include/linux/async_tx.h



AT24 EEPROM DRIVER

M:	Wolfram Sang <w.sang@pengutronix.de>

M:	Wolfram Sang <wsa@the-dreams.de>

L:	linux-i2c@vger.kernel.org

S:	Maintained

F:	drivers/misc/eeprom/at24.c
@@ -3757,12 +3757,11 @@ S: Maintained 
F:	drivers/i2c/i2c-stub.c



I2C SUBSYSTEM

M:	Wolfram Sang <w.sang@pengutronix.de>

M:	Wolfram Sang <wsa@the-dreams.de>

M:	"Ben Dooks (embedded platforms)" <ben-linux@fluff.org>

L:	linux-i2c@vger.kernel.org

W:	http://i2c.wiki.kernel.org/

T:	quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-i2c/

T:	git git://git.pengutronix.de/git/wsa/linux.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git

S:	Maintained

F:	Documentation/i2c/

F:	drivers/i2c/
@@ -5778,15 +5777,6 @@ L: linux-i2c@vger.kernel.org 
S:	Maintained

F:	drivers/i2c/muxes/i2c-mux-pca9541.c



PCA9564/PCA9665 I2C BUS DRIVER

M:	Wolfram Sang <w.sang@pengutronix.de>

L:	linux-i2c@vger.kernel.org

S:	Maintained

F:	drivers/i2c/algos/i2c-algo-pca.c

F:	drivers/i2c/busses/i2c-pca-*

F:	include/linux/i2c-algo-pca.h

F:	include/linux/i2c-pca-platform.h



PCDP - PRIMARY CONSOLE AND DEBUG PORT

M:	Khalid Aziz <khalid@gonehiking.org>

S:	Maintained

CRA Git | Maintained and supported by SUSTech CRA and CCSE