Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 48a8840..e2ed69f 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1921,8 +1921,8 @@ F:        drivers/bcma/
 F:     include/linux/bcma/
 
 BROCADE BFA FC SCSI DRIVER
-M:     Anil Gurumurthy <agurumur@brocade.com>
-M:     Vijaya Mohan Guvva <vmohan@brocade.com>
+M:     Anil Gurumurthy <anil.gurumurthy@qlogic.com>
+M:     Sudarsana Kalluru <sudarsana.kalluru@qlogic.com>
 L:     linux-scsi@vger.kernel.org
 S:     Supported
 F:     drivers/scsi/bfa/
@@ -5254,11 +5254,10 @@ F:      arch/powerpc/platforms/512x/
 F:     arch/powerpc/platforms/52xx/
 
 LINUX FOR POWERPC EMBEDDED PPC4XX
-M:     Josh Boyer <jwboyer@gmail.com>
+M:  Alistair Popple <alistair@popple.id.au>
 M:     Matt Porter <mporter@kernel.crashing.org>
 W:     http://www.penguinppc.org/
 L:     linuxppc-dev@lists.ozlabs.org
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git
 S:     Maintained
 F:     arch/powerpc/platforms/40x/
 F:     arch/powerpc/platforms/44x/
@@ -7840,13 +7839,6 @@ F:       Documentation/ia64/serial.txt
 F:     drivers/tty/serial/ioc?_serial.c
 F:     include/linux/ioc?.h
 
-SGI VISUAL WORKSTATION 320 AND 540
-M:     Andrey Panin <pazke@donpac.ru>
-L:     linux-visws-devel@lists.sf.net
-W:     http://linux-visws.sf.net
-S:     Maintained for 2.6.
-F:     Documentation/sgi-visws.txt
-
 SGI XP/XPC/XPNET DRIVER
 M:     Cliff Whickman <cpw@sgi.com>
 M:     Robin Holt <robinmholt@gmail.com>
@@ -9130,8 +9122,7 @@ S:        Maintained
 F:     drivers/net/wireless/ath/ar5523/
 
 USB ATTACHED SCSI
-M:     Matthew Wilcox <willy@linux.intel.com>
-M:     Sarah Sharp <sarah.a.sharp@linux.intel.com>
+M:     Hans de Goede <hdegoede@redhat.com>
 M:     Gerd Hoffmann <kraxel@redhat.com>
 L:     linux-usb@vger.kernel.org
 L:     linux-scsi@vger.kernel.org
@@ -9357,7 +9348,7 @@ S:        Maintained
 F:     drivers/net/wireless/rndis_wlan.c
 
 USB XHCI DRIVER
-M:     Sarah Sharp <sarah.a.sharp@linux.intel.com>
+M:     Mathias Nyman <mathias.nyman@intel.com>
 L:     linux-usb@vger.kernel.org
 S:     Supported
 F:     drivers/usb/host/xhci*