Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...

[cascardo/linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 9bd4422..69aa8fe 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2212,6 +2212,13 @@ W:       bluesmoke.sourceforge.net
 S:     Maintained
 F:     drivers/edac/i5400_edac.c
 
+EDAC-I7300
+M:     Mauro Carvalho Chehab <mchehab@redhat.com>
+L:     linux-edac@vger.kernel.org
+W:     bluesmoke.sourceforge.net
+S:     Maintained
+F:     drivers/edac/i7300_edac.c
+
 EDAC-I7CORE
 M:     Mauro Carvalho Chehab <mchehab@redhat.com>
 L:     linux-edac@vger.kernel.org
@@ -3434,7 +3441,7 @@ F:        scripts/package/
 
 KERNEL JANITORS
 L:     kernel-janitors@vger.kernel.org
-W:     http://janitor.kernelnewbies.org/
+W:     http://kernelnewbies.org/KernelJanitors
 S:     Odd Fixes
 
 KERNEL NFSD, SUNRPC, AND LOCKD SERVERS
@@ -4541,6 +4548,12 @@ S:       Maintained
 F:     drivers/leds/leds-pca9532.c
 F:     include/linux/leds-pca9532.h
 
+PCA9541 I2C BUS MASTER SELECTOR DRIVER
+M:     Guenter Roeck <guenter.roeck@ericsson.com>
+L:     linux-i2c@vger.kernel.org
+S:     Maintained
+F:     drivers/i2c/muxes/pca9541.c
+
 PCA9564/PCA9665 I2C BUS DRIVER
 M:     Wolfram Sang <w.sang@pengutronix.de>
 L:     linux-i2c@vger.kernel.org