1 files changed, 70 insertions, 24 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 162b0fe3b001..11b3937adb89 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -242,8 +242,8 @@ S:	Maintained
 F:      drivers/platform/x86/acer-wmi.c
 
 ACPI
-M:      Len Brown <lenb@kernel.org>
 M:      Rafael J. Wysocki <rjw@rjwysocki.net>
+M:      Len Brown <lenb@kernel.org>
 L:      linux-acpi@vger.kernel.org
 W:      https://01.org/linux-acpi
 Q:      https://patchwork.kernel.org/project/linux-acpi/list/
@@ -1327,6 +1327,7 @@ M:	Linus Walleij <linus.walleij@linaro.org>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Supported
 F:      arch/arm/mach-u300/
+F:      drivers/clocksource/timer-u300.c
 F:      drivers/i2c/busses/i2c-stu300.c
 F:      drivers/rtc/rtc-coh901331.c
 F:      drivers/watchdog/coh901327_wdt.c
@@ -1933,8 +1934,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/
@@ -2216,6 +2217,13 @@ L:	alsa-devel@alsa-project.org (moderated for non-subscribers)
 S:      Odd Fixes
 F:      sound/soc/codecs/cs4270*
 
+CIRRUS LOGIC AUDIO CODEC DRIVERS
+M:      Brian Austin <brian.austin@cirrus.com>
+M:      Paul Handrigan <Paul.Handrigan@cirrus.com>
+L:      alsa-devel@alsa-project.org (moderated for non-subscribers)
+S:      Maintained
+F:      sound/soc/codecs/cs*
+
 CLEANCACHE API
 M:      Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
 L:      linux-kernel@vger.kernel.org
@@ -2814,9 +2822,9 @@ S:	Supported
 F:      drivers/acpi/dock.c
 
 DOCUMENTATION
-M:      Rob Landley <rob@landley.net>
+M:      Randy Dunlap <rdunlap@infradead.org>
 L:      linux-doc@vger.kernel.org
-T:      TBD
+T:      quilt http://www.infradead.org/~rdunlap/Doc/patches/
 S:      Maintained
 F:      Documentation/
 
@@ -3670,8 +3678,8 @@ S:	Maintained
 F:      fs/freevxfs/
 
 FREEZER
-M:      Pavel Machek <pavel@ucw.cz>
 M:      "Rafael J. Wysocki" <rjw@rjwysocki.net>
+M:      Pavel Machek <pavel@ucw.cz>
 L:      linux-pm@vger.kernel.org
 S:      Supported
 F:      Documentation/power/freezing-of-tasks.txt
@@ -4035,8 +4043,8 @@ S:	Maintained
 F:      drivers/video/hgafb.c
 
 HIBERNATION (aka Software Suspend, aka swsusp)
-M:      Pavel Machek <pavel@ucw.cz>
 M:      "Rafael J. Wysocki" <rjw@rjwysocki.net>
+M:      Pavel Machek <pavel@ucw.cz>
 L:      linux-pm@vger.kernel.org
 S:      Supported
 F:      arch/x86/power/
@@ -5259,11 +5267,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/
@@ -5701,6 +5708,12 @@ L:	linux-watchdog@vger.kernel.org
 S:      Supported
 F:      drivers/watchdog/mena21_wdt.c
 
+MEN CHAMELEON BUS (mcb)
+M:      Johannes Thumshirn <johannes.thumshirn@men.de>
+S:      Supported
+F:      drivers/mcb/
+F:      include/linux/mcb.h
+
 METAG ARCHITECTURE
 M:      James Hogan <james.hogan@imgtec.com>
 L:      linux-metag@vger.kernel.org
@@ -7415,10 +7428,26 @@ W:	http://www.ibm.com/developerworks/linux/linux390/
 S:      Supported
 F:      arch/s390/
 F:      drivers/s390/
-F:      block/partitions/ibm.c
 F:      Documentation/s390/
 F:      Documentation/DocBook/s390*
 
+S390 COMMON I/O LAYER
+M:      Sebastian Ott <sebott@linux.vnet.ibm.com>
+M:      Peter Oberparleiter <oberpar@linux.vnet.ibm.com>
+L:      linux-s390@vger.kernel.org
+W:      http://www.ibm.com/developerworks/linux/linux390/
+S:      Supported
+F:      drivers/s390/cio/
+
+S390 DASD DRIVER
+M:      Stefan Weinhuber <wein@de.ibm.com>
+M:      Stefan Haberland <stefan.haberland@de.ibm.com>
+L:      linux-s390@vger.kernel.org
+W:      http://www.ibm.com/developerworks/linux/linux390/
+S:      Supported
+F:      drivers/s390/block/dasd*
+F:      block/partitions/ibm.c
+
 S390 NETWORK DRIVERS
 M:      Ursula Braun <ursula.braun@de.ibm.com>
 M:      Frank Blaschka <blaschka@linux.vnet.ibm.com>
@@ -7428,6 +7457,15 @@ W:	http://www.ibm.com/developerworks/linux/linux390/
 S:      Supported
 F:      drivers/s390/net/
 
+S390 PCI SUBSYSTEM
+M:      Sebastian Ott <sebott@linux.vnet.ibm.com>
+M:      Gerald Schaefer <gerald.schaefer@de.ibm.com>
+L:      linux-s390@vger.kernel.org
+W:      http://www.ibm.com/developerworks/linux/linux390/
+S:      Supported
+F:      arch/s390/pci/
+F:      drivers/pci/hotplug/s390_pci_hpc.c
+
 S390 ZCRYPT DRIVER
 M:      Ingo Tuchscherer <ingo.tuchscherer@de.ibm.com>
 M:      linux390@de.ibm.com
@@ -7820,13 +7858,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>
@@ -8374,6 +8405,12 @@ M:	Teddy Wang <teddy.wang@siliconmotion.com.cn>
 S:      Odd Fixes
 F:      drivers/staging/sm7xxfb/
 
+STAGING - SLICOSS
+M:      Lior Dotan <liodot@gmail.com>
+M:      Christopher Harrer <charrer@alacritech.com>
+S:      Odd Fixes
+F:      drivers/staging/slicoss/
+
 STAGING - SOFTLOGIC 6x10 MPEG CODEC
 M:      Ismael Luceno <ismael.luceno@corp.bluecherry.net>
 S:      Supported
@@ -8446,9 +8483,9 @@ F:	arch/sh/
 F:      drivers/sh/
 
 SUSPEND TO RAM
+M:      "Rafael J. Wysocki" <rjw@rjwysocki.net>
 M:      Len Brown <len.brown@intel.com>
 M:      Pavel Machek <pavel@ucw.cz>
-M:      "Rafael J. Wysocki" <rjw@rjwysocki.net>
 L:      linux-pm@vger.kernel.org
 S:      Supported
 F:      Documentation/power/
@@ -9059,6 +9096,13 @@ F:	drivers/cdrom/cdrom.c
 F:      include/linux/cdrom.h
 F:      include/uapi/linux/cdrom.h
 
+UNISYS S-PAR DRIVERS
+M:     Benjamin Romer <benjamin.romer@unisys.com>
+M:     David Kershner <david.kershner@unisys.com>
+L:     sparmaintainer@unisys.com (Unisys internal)
+S:     Supported
+F:     drivers/staging/unisys/
+
 UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER
 M:      Vinayak Holikatti <vinholikatti@gmail.com>
 M:      Santosh Y <santoshsy@gmail.com>
@@ -9097,8 +9141,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
@@ -9324,7 +9367,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*
@@ -9408,7 +9451,6 @@ F:	include/media/videobuf2-*
 
 VIRTIO CONSOLE DRIVER
 M:      Amit Shah <amit.shah@redhat.com>
-L:      virtio-dev@lists.oasis-open.org
 L:      virtualization@lists.linux-foundation.org
 S:      Maintained
 F:      drivers/char/virtio_console.c
@@ -9418,7 +9460,6 @@ F:	include/uapi/linux/virtio_console.h
 VIRTIO CORE, NET AND BLOCK DRIVERS
 M:      Rusty Russell <rusty@rustcorp.com.au>
 M:      "Michael S. Tsirkin" <mst@redhat.com>
-L:      virtio-dev@lists.oasis-open.org
 L:      virtualization@lists.linux-foundation.org
 S:      Maintained
 F:      drivers/virtio/
@@ -9431,7 +9472,6 @@ F:	include/uapi/linux/virtio_*.h
 VIRTIO HOST (VHOST)
 M:      "Michael S. Tsirkin" <mst@redhat.com>
 L:      kvm@vger.kernel.org
-L:      virtio-dev@lists.oasis-open.org
 L:      virtualization@lists.linux-foundation.org
 L:      netdev@vger.kernel.org
 S:      Maintained
@@ -9802,6 +9842,12 @@ L:	linux-serial@vger.kernel.org
 S:      Maintained
 F:      drivers/tty/serial/uartlite.c
 
+XTENSA XTFPGA PLATFORM SUPPORT
+M:      Max Filippov <jcmvbkbc@gmail.com>
+L:      linux-xtensa@linux-xtensa.org
+S:      Maintained
+F:      drivers/spi/spi-xtensa-xtfpga.c
+
 YAM DRIVER FOR AX.25
 M:      Jean-Paul Roubelat <jpr@f6fbb.org>
 L:      linux-hams@vger.kernel.org