1 files changed, 72 insertions, 3 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 85e1734f9a50..107a5a5a0174 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -652,6 +652,9 @@ ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
 M:      Sascha Hauer <kernel@pengutronix.de>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
+T:      git://git.pengutronix.de/git/imx/linux-2.6.git
+F:      arch/arm/mach-mx*/
+F:      arch/arm/plat-mxc/
 
 ARM/GLOMATION GESBC9312SX MACHINE SUPPORT
 M:      Lennert Buytenhek <kernel@wantstofly.org>
@@ -722,6 +725,19 @@ L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
 F:      arch/arm/mach-ixp4xx/
 
+ARM/INTEL RESEARCH IMOTE 2 MACHINE SUPPORT
+M:      Jonathan Cameron <jic23@cam.ac.uk>
+L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S:      Maintained
+F:      arch/arm/mach-pxa/imote2.c
+
+ARM/INTEL RESEARCH STARGATE 2 MACHINE SUPPORT
+M:      Jonathan Cameron <jic23@cam.ac.uk>
+L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S:      Maintained
+F:      arch/arm/mach-pxa/stargate2.c
+F:      drivers/pcmcia/pxa2xx_stargate2.c
+
 ARM/INTEL XSC3 (MANZANO) ARM CORE
 M:      Lennert Buytenhek <kernel@wantstofly.org>
 M:      Dan Williams <dan.j.williams@intel.com>
@@ -764,6 +780,14 @@ ARM/NEC MOBILEPRO 900/c MACHINE SUPPORT
 M:      Michael Petchkovsky <mkpetch@internode.on.net>
 S:      Maintained
 
+ARM/NOMADIK ARCHITECTURE
+M:     Alessandro Rubini <rubini@unipv.it>
+M:     STEricsson <STEricsson_nomadik_linux@list.st.com>
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S:     Maintained
+F:     arch/arm/mach-nomadik/
+F:     arch/arm/plat-nomadik/
+
 ARM/OPENMOKO NEO FREERUNNER (GTA02) MACHINE SUPPORT
 M:      Nelson Castillo <arhuaco@freaks-unidos.net>
 L:      openmoko-kernel@lists.openmoko.org (subscribers-only)
@@ -908,6 +932,12 @@ L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 W:      http://www.mcuos.com
 S:      Maintained
 
+ARM/U8500 ARM ARCHITECTURE
+M:      Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
+L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S:      Maintained
+F:      arch/arm/mach-ux500/
+
 ARM/VFP SUPPORT
 M:      Russell King <linux@arm.linux.org.uk>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -1113,7 +1143,6 @@ F:	include/net/ax25.h
 F:      net/ax25/
 
 B43 WIRELESS DRIVER
-M:      Michael Buesch <mb@bu3sch.de>
 M:      Stefano Brivio <stefano.brivio@polimi.it>
 L:      linux-wireless@vger.kernel.org
 W:      http://linuxwireless.org/en/users/Drivers/b43
@@ -1812,6 +1841,19 @@ S:	Maintained
 F:      drivers/scsi/dpt*
 F:      drivers/scsi/dpt/
 
+DRBD DRIVER
+P:     Philipp Reisner
+P:     Lars Ellenberg
+M:     drbd-dev@lists.linbit.com
+L:     drbd-user@lists.linbit.com
+W:     http://www.drbd.org
+T:     git git://git.drbd.org/linux-2.6-drbd.git drbd
+T:     git git://git.drbd.org/drbd-8.3.git
+S:     Supported
+F:     drivers/block/drbd/
+F:     lib/lru_cache.c
+F:     Documentation/blockdev/drbd/
+
 DRIVER CORE, KOBJECTS, AND SYSFS
 M:      Greg Kroah-Hartman <gregkh@suse.de>
 T:      quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/
@@ -2810,6 +2852,15 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6.git
 S:      Supported
 F:      drivers/net/wireless/iwlwifi/
 
+INTEL WIRELESS MULTICOMM 3200 WIFI (iwmc3200wifi)
+M:      Samuel Ortiz <samuel.ortiz@intel.com>
+M:      Zhu Yi <yi.zhu@intel.com>
+M:      Intel Linux Wireless <ilw@linux.intel.com>
+L:      linux-wireless@vger.kernel.org
+S:      Supported
+W:      http://wireless.kernel.org/en/users/Drivers/iwmc3200wifi
+F:      drivers/net/wireless/iwmc3200wifi/
+
 IOC3 ETHERNET DRIVER
 M:      Ralf Baechle <ralf@linux-mips.org>
 L:      linux-mips@linux-mips.org
@@ -3081,6 +3132,7 @@ S:	Supported
 F:      Documentation/s390/kvm.txt
 F:      arch/s390/include/asm/kvm*
 F:      arch/s390/kvm/
+F:      drivers/s390/kvm/
 
 KEXEC
 M:      Eric Biederman <ebiederm@xmission.com>
@@ -3734,9 +3786,9 @@ F:	include/linux/if_*
 F:      include/linux/*device.h
 
 NETXEN (1/10) GbE SUPPORT
-M:      Dhananjay Phadke <dhananjay@netxen.com>
+M:      Amit Kumar Salecha <amit.salecha@qlogic.com>
 L:      netdev@vger.kernel.org
-W:      http://www.netxen.com
+W:      http://www.qlogic.com
 S:      Supported
 F:      drivers/net/netxen/
 
@@ -4137,6 +4189,13 @@ W:	http://www.pmc-sierra.com/
 S:      Supported
 F:      drivers/scsi/pmcraid.*
 
+PMC SIERRA PM8001 DRIVER
+M:      jack_wang@usish.com
+M:      lindar_liu@usish.com
+L:      linux-scsi@vger.kernel.org
+S:      Supported
+F:      drivers/scsi/pm8001/
+
 POSIX CLOCKS and TIMERS
 M:      Thomas Gleixner <tglx@linutronix.de>
 S:      Supported
@@ -4495,6 +4554,7 @@ L:	linux-s390@vger.kernel.org
 W:      http://www.ibm.com/developerworks/linux/linux390/
 S:      Supported
 F:      arch/s390/
+F:      drivers/s390/
 
 S390 NETWORK DRIVERS
 M:      Ursula Braun <ursula.braun@de.ibm.com>
@@ -4510,6 +4570,7 @@ M:	Felix Beck <felix.beck@de.ibm.com>
 M:      Ralph Wuerthner <ralph.wuerthner@de.ibm.com>
 M:      linux390@de.ibm.com
 L:      linux-s390@vger.kernel.org
+W:      http://www.ibm.com/developerworks/linux/linux390/
 S:      Supported
 F:      drivers/s390/crypto/
 
@@ -5711,6 +5772,14 @@ L:	netdev@vger.kernel.org
 S:      Maintained
 F:      drivers/net/vmxnet3/
 
+VMware PVSCSI driver
+M:      Alok Kataria <akataria@vmware.com>
+M:      VMware PV-Drivers <pv-drivers@vmware.com>
+L:      linux-scsi@vger.kernel.org
+S:      Maintained
+F:      drivers/scsi/vmw_pvscsi.c
+F:      drivers/scsi/vmw_pvscsi.h
+
 VOLTAGE AND CURRENT REGULATOR FRAMEWORK
 M:      Liam Girdwood <lrg@slimlogic.co.uk>
 M:      Mark Brown <broonie@opensource.wolfsonmicro.com>