1 files changed, 7 insertions, 12 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 7f7a7f5f7386..0d0108fea26f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3515,7 +3515,7 @@ F:	drivers/isdn/gigaset/
 F:      include/uapi/linux/gigaset_dev.h
 
 GPIO SUBSYSTEM
-M:      Grant Likely <grant.likely@secretlab.ca>
+M:      Grant Likely <grant.likely@linaro.org>
 M:      Linus Walleij <linus.walleij@linaro.org>
 S:      Maintained
 T:      git git://git.secretlab.ca/git/linux-2.6.git
@@ -4348,7 +4348,7 @@ F:	drivers/irqchip/
 
 IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY)
 M:      Benjamin Herrenschmidt <benh@kernel.crashing.org>
-M:      Grant Likely <grant.likely@secretlab.ca>
+M:      Grant Likely <grant.likely@linaro.org>
 T:      git git://git.secretlab.ca/git/linux-2.6.git irqdomain/next
 S:      Maintained
 F:      Documentation/IRQ-domain.txt
@@ -4835,11 +4835,8 @@ F:	arch/powerpc/platforms/40x/
 F:      arch/powerpc/platforms/44x/
 
 LINUX FOR POWERPC EMBEDDED XILINX VIRTEX
-M:      Grant Likely <grant.likely@secretlab.ca>
-W:      http://wiki.secretlab.ca/index.php/Linux_on_Xilinx_Virtex
 L:      linuxppc-dev@lists.ozlabs.org
-T:      git git://git.secretlab.ca/git/linux-2.6.git
-S:      Maintained
+S:      Unmaintained
 F:      arch/powerpc/*/*virtex*
 F:      arch/powerpc/*/*/*virtex*
 
@@ -5857,7 +5854,7 @@ F:	Documentation/i2c/busses/i2c-ocores
 F:      drivers/i2c/busses/i2c-ocores.c
 
 OPEN FIRMWARE AND FLATTENED DEVICE TREE
-M:      Grant Likely <grant.likely@secretlab.ca>
+M:      Grant Likely <grant.likely@linaro.org>
 M:      Rob Herring <rob.herring@calxeda.com>
 L:      devicetree-discuss@lists.ozlabs.org (moderated for non-subscribers)
 W:      http://fdt.secretlab.ca
@@ -7481,11 +7478,11 @@ S:	Maintained
 F:      drivers/clk/spear/
 
 SPI SUBSYSTEM
-M:      Grant Likely <grant.likely@secretlab.ca>
 M:      Mark Brown <broonie@kernel.org>
+M:      Grant Likely <grant.likely@linaro.org>
 L:      spi-devel-general@lists.sourceforge.net
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git
 Q:      http://patchwork.kernel.org/project/spi-devel-general/list/
-T:      git git://git.secretlab.ca/git/linux-2.6.git
 S:      Maintained
 F:      Documentation/spi/
 F:      drivers/spi/
@@ -8996,9 +8993,7 @@ S:	Maintained
 F:      drivers/net/ethernet/xilinx/xilinx_axienet*
 
 XILINX SYSTEMACE DRIVER
-M:      Grant Likely <grant.likely@secretlab.ca>
-W:      http://www.secretlab.ca/
-S:      Maintained
+S:      Unmaintained
 F:      drivers/block/xsysace.c
 
 XILINX UARTLITE SERIAL DRIVER