1 files changed, 28 insertions, 16 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 1f8e194bdd6c..122418c21653 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1311,7 +1311,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
@@ -2148,10 +2148,10 @@ S:	Maintained
 F:      tools/power/cpupower
 
 CPUSETS
-M:      Paul Menage <paul@paulmenage.org>
+M:      Li Zefan <lizefan@huawei.com>
 W:      http://www.bullopensource.org/cpuset/
 W:      http://oss.sgi.com/projects/cpusets/
-S:      Supported
+S:      Maintained
 F:      Documentation/cgroups/cpusets.txt
 F:      include/linux/cpuset.h
 F:      kernel/cpuset.c
@@ -3765,12 +3765,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/
@@ -5786,15 +5785,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
@@ -6606,7 +6596,7 @@ F:	drivers/dma/dw_dmac_regs.h
 F:      drivers/dma/dw_dmac.c
 
 TIMEKEEPING, NTP
-M:      John Stultz <johnstul@us.ibm.com>
+M:      John Stultz <john.stultz@linaro.org>
 M:      Thomas Gleixner <tglx@linutronix.de>
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
 S:      Supported
@@ -7186,6 +7176,7 @@ F:	drivers/clk/spear/
 
 SPI SUBSYSTEM
 M:      Grant Likely <grant.likely@secretlab.ca>
+M:      Mark Brown <broonie@opensource.wolfsonmicro.com>
 L:      spi-devel-general@lists.sourceforge.net
 Q:      http://patchwork.kernel.org/project/spi-devel-general/list/
 T:      git git://git.secretlab.ca/git/linux-2.6.git
@@ -7551,6 +7542,11 @@ F:	drivers/net/team/
 F:      include/linux/if_team.h
 F:      include/uapi/linux/if_team.h
 
+TECHNOLOGIC SYSTEMS TS-5500 PLATFORM SUPPORT
+M:      Savoir-faire Linux Inc. <kernel@savoirfairelinux.com>
+S:      Maintained
+F:      arch/x86/platform/ts5500/
+
 TECHNOTREND USB IR RECEIVER
 M:      Sean Young <sean@mess.org>
 L:      linux-media@vger.kernel.org
@@ -7625,6 +7621,22 @@ F:	Documentation/backlight/lp855x-driver.txt
 F:      drivers/video/backlight/lp855x_bl.c
 F:      include/linux/platform_data/lp855x.h
 
+TI LP8727 CHARGER DRIVER
+M:      Milo Kim <milo.kim@ti.com>
+S:      Maintained
+F:      drivers/power/lp8727_charger.c
+F:      include/linux/platform_data/lp8727.h
+
+TI LP8788 MFD DRIVER
+M:      Milo Kim <milo.kim@ti.com>
+S:      Maintained
+F:      drivers/iio/adc/lp8788_adc.c
+F:      drivers/leds/leds-lp8788.c
+F:      drivers/mfd/lp8788*.c
+F:      drivers/power/lp8788-charger.c
+F:      drivers/regulator/lp8788-*.c
+F:      include/linux/mfd/lp8788*.h
+
 TI TWL4030 SERIES SOC CODEC DRIVER
 M:      Peter Ujfalusi <peter.ujfalusi@ti.com>
 L:      alsa-devel@alsa-project.org (moderated for non-subscribers)