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

[linux-block.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index e95cb772f93111f8e327233e662315f44a5db8a6..e613c6dd709f714d0e8745416e95a79237d8c990 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -534,10 +534,30 @@ L:        linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 W:     http://maxim.org.za/at91_26.html
 S:     Maintained
 
+ARM/BCMRING ARM ARCHITECTURE
+M:     Leo Chen <leochen@broadcom.com>
+M:     Scott Branden <sbranden@broadcom.com>
+L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+S:     Maintained
+F:     arch/arm/mach-bcmring
+
+ARM/BCMRING MTD NAND DRIVER
+M:     Leo Chen <leochen@broadcom.com>
+M:     Scott Branden <sbranden@broadcom.com>
+L:     linux-mtd@lists.infradead.org
+S:     Maintained
+F:     drivers/mtd/nand/bcm_umi_nand.c
+F:     drivers/mtd/nand/bcm_umi_bch.c
+F:     drivers/mtd/nand/bcm_umi_hamming.c
+F:     drivers/mtd/nand/nand_bcm_umi.h
+
 ARM/CIRRUS LOGIC EP93XX ARM ARCHITECTURE
-M:     Lennert Buytenhek <kernel@wantstofly.org>
+M:     Hartley Sweeten <hsweeten@visionengravers.com>
+M:     Ryan Mallon <ryan@bluewatersys.com>
 L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 S:     Maintained
+F:     arch/arm/mach-ep93xx/
+F:     arch/arm/mach-ep93xx/include/mach/
 
 ARM/CIRRUS LOGIC EDB9315A MACHINE SUPPORT
 M:     Lennert Buytenhek <kernel@wantstofly.org>
@@ -685,6 +705,18 @@ ARM/MAGICIAN MACHINE SUPPORT
 M:     Philipp Zabel <philipp.zabel@gmail.com>
 S:     Maintained
 
+ARM/Marvell Loki/Kirkwood/MV78xx0/Orion SOC support
+M:     Lennert Buytenhek <buytenh@marvell.com>
+M:     Nicolas Pitre <nico@marvell.com>
+L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+T:     git git://git.marvell.com/orion
+S:     Maintained
+F:     arch/arm/mach-loki/
+F:     arch/arm/mach-kirkwood/
+F:     arch/arm/mach-mv78xx0/
+F:     arch/arm/mach-orion5x/
+F:     arch/arm/plat-orion/
+
 ARM/MIOA701 MACHINE SUPPORT
 M:     Robert Jarzmik <robert.jarzmik@free.fr>
 L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
@@ -899,6 +931,12 @@ W: http://wireless.kernel.org/en/users/Drivers/ar9170
 S:     Maintained
 F:     drivers/net/wireless/ath/ar9170/
 
+ATK0110 HWMON DRIVER
+M:     Luca Tettamanti <kronos.it@gmail.com>
+L:     lm-sensors@lm-sensors.org
+S:     Maintained
+F:     drivers/hwmon/asus_atk0110.c
+
 ATI_REMOTE2 DRIVER
 M:     Ville Syrjala <syrjala@sci.fi>
 S:     Maintained
@@ -2120,13 +2158,16 @@ F:      Documentation/filesystems/caching/
 F:     fs/fscache/
 F:     include/linux/fscache*.h
 
-FTRACE
+TRACING
 M:     Steven Rostedt <rostedt@goodmis.org>
+M:     Frederic Weisbecker <fweisbec@gmail.com>
+M:     Ingo Molnar <mingo@redhat.com>
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git tracing/core
 S:     Maintained
 F:     Documentation/trace/ftrace.txt
 F:     arch/*/*/*/ftrace.h
 F:     arch/*/kernel/ftrace.c
-F:     include/*/ftrace.h
+F:     include/*/ftrace.h include/trace/ include/linux/trace*.h
 F:     kernel/trace/
 
 FUJITSU FR-V (FRV) PORT
@@ -2186,6 +2227,13 @@ T:       git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git
 S:     Maintained
 F:     include/asm-generic
 
+GENERIC UIO DRIVER FOR PCI DEVICES
+M:     Michael S. Tsirkin <mst@redhat.com>
+L:     kvm@vger.kernel.org
+L:     linux-kernel@vger.kernel.org
+S:     Supported
+F:     drivers/uio/uio_pci_generic.c
+
 GFS2 FILE SYSTEM
 M:     Steven Whitehouse <swhiteho@redhat.com>
 L:     cluster-devel@redhat.com
@@ -2926,6 +2974,7 @@ F:        include/linux/sunrpc/
 
 KERNEL VIRTUAL MACHINE (KVM)
 M:     Avi Kivity <avi@redhat.com>
+M:     Marcelo Tosatti <mtosatti@redhat.com>
 L:     kvm@vger.kernel.org
 W:     http://kvm.qumranet.com
 S:     Supported
@@ -3284,7 +3333,7 @@ S:        Supported
 F:     drivers/net/wireless/mwl8k.c
 
 MARVELL SOC MMC/SD/SDIO CONTROLLER DRIVER
-M:     Nicolas Pitre <nico@cam.org>
+M:     Nicolas Pitre <nico@fluxnic.net>
 S:     Maintained
 
 MARVELL YUKON / SYSKONNECT DRIVER
@@ -3976,6 +4025,14 @@ S:       Maintained
 F:     drivers/block/pktcdvd.c
 F:     include/linux/pktcdvd.h
 
+PMC SIERRA MaxRAID DRIVER
+P:     Anil Ravindranath
+M:     anil_ravindranath@pmc-sierra.com
+L:     linux-scsi@vger.kernel.org
+W:     http://www.pmc-sierra.com/
+S:     Supported
+F:     drivers/scsi/pmcraid.*
+
 POSIX CLOCKS and TIMERS
 M:     Thomas Gleixner <tglx@linutronix.de>
 S:     Supported
@@ -4414,7 +4471,7 @@ F:        drivers/scsi/sg.c
 F:     include/scsi/sg.h
 
 SCSI SUBSYSTEM
-M:     "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
+M:     "James E.J. Bottomley" <James.Bottomley@suse.de>
 L:     linux-scsi@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git
@@ -4648,7 +4705,7 @@ F:        include/linux/sl?b*.h
 F:     mm/sl?b.c
 
 SMC91x ETHERNET DRIVER
-M:     Nicolas Pitre <nico@cam.org>
+M:     Nicolas Pitre <nico@fluxnic.net>
 S:     Maintained
 F:     drivers/net/smc91x.*
 
@@ -5653,7 +5710,7 @@ F:        include/xen/
 
 XFS FILESYSTEM
 P:     Silicon Graphics Inc
-M:     Felix Blyakher <felixb@sgi.com>
+M:     Alex Elder <aelder@sgi.com>
 M:     xfs-masters@oss.sgi.com
 L:     xfs@oss.sgi.com
 W:     http://oss.sgi.com/projects/xfs