Merge branch 'x86-kaslr-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index ed33afb20a514838ec9efc2a89a0eaacfd399b03..e8f8c3549684373be58be0f5de3753db8aea7ea2 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2444,9 +2444,7 @@ S:        Maintained
 F:     drivers/platform/x86/dell-laptop.c
 
 DELL LAPTOP SMM DRIVER
-M:     Massimo Dal Zotto <dz@debian.org>
-W:     http://www.debian.org/~dz/i8k/
-S:     Maintained
+S:     Orphan
 F:     drivers/char/i8k.c
 F:     include/uapi/linux/i8k.h
 
@@ -3517,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
@@ -4350,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
@@ -4837,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*
 
@@ -5859,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
@@ -7483,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/
@@ -8384,9 +8379,10 @@ S:       Maintained
 F:     drivers/usb/serial/option.c
 
 USB PEGASUS DRIVER
-M:     Petko Manolov <petkan@users.sourceforge.net>
+M:     Petko Manolov <petkan@nucleusys.com>
 L:     linux-usb@vger.kernel.org
 L:     netdev@vger.kernel.org
+T:     git git://git.code.sf.net/p/pegasus2/git
 W:     http://pegasus2.sourceforge.net/
 S:     Maintained
 F:     drivers/net/usb/pegasus.*
@@ -8406,9 +8402,10 @@ S:       Supported
 F:     drivers/usb/class/usblp.c
 
 USB RTL8150 DRIVER
-M:     Petko Manolov <petkan@users.sourceforge.net>
+M:     Petko Manolov <petkan@nucleusys.com>
 L:     linux-usb@vger.kernel.org
 L:     netdev@vger.kernel.org
+T:     git git://git.code.sf.net/p/pegasus2/git
 W:     http://pegasus2.sourceforge.net/
 S:     Maintained
 F:     drivers/net/usb/rtl8150.c
@@ -8734,7 +8731,7 @@ F:        drivers/scsi/vmw_pvscsi.c
 F:     drivers/scsi/vmw_pvscsi.h
 
 VOLTAGE AND CURRENT REGULATOR FRAMEWORK
-M:     Liam Girdwood <lrg@ti.com>
+M:     Liam Girdwood <lgirdwood@gmail.com>
 M:     Mark Brown <broonie@kernel.org>
 W:     http://opensource.wolfsonmicro.com/node/15
 W:     http://www.slimlogic.co.uk/?p=48
@@ -8998,9 +8995,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