Merge branch 'misc-2.6.32' into release

[linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index e95cb772f93111f8e327233e662315f44a5db8a6..bb2c683eb611a4f00262d8d6304f9068236482e5 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -534,10 +534,30 @@ L:        [email protected] (subscribers-only)
 W:     http://maxim.org.za/at91_26.html
 S:     Maintained
 
+ARM/BCMRING ARM ARCHITECTURE
+M:     Leo Chen <[email protected]>
+M:     Scott Branden <[email protected]>
+L:     [email protected] (subscribers-only)
+S:     Maintained
+F:     arch/arm/mach-bcmring
+
+ARM/BCMRING MTD NAND DRIVER
+M:     Leo Chen <[email protected]>
+M:     Scott Branden <[email protected]>
+L:     [email protected]
+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 <[email protected]>
+M:     Hartley Sweeten <[email protected]>
+M:     Ryan Mallon <[email protected]>
 L:     [email protected] (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 <[email protected]>
@@ -685,6 +705,18 @@ ARM/MAGICIAN MACHINE SUPPORT
 M:     Philipp Zabel <[email protected]>
 S:     Maintained
 
+ARM/Marvell Loki/Kirkwood/MV78xx0/Orion SOC support
+M:     Lennert Buytenhek <[email protected]>
+M:     Nicolas Pitre <[email protected]>
+L:     [email protected] (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 <[email protected]>
 L:     [email protected] (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 <[email protected]>
+L:     [email protected]
+S:     Maintained
+F:     drivers/hwmon/asus_atk0110.c
+
 ATI_REMOTE2 DRIVER
 M:     Ville Syrjala <[email protected]>
 S:     Maintained
@@ -1935,7 +1973,6 @@ F:        fs/ext2/
 F:     include/linux/ext2*
 
 EXT3 FILE SYSTEM
-M:     Stephen Tweedie <[email protected]>
 M:     Andrew Morton <[email protected]>
 M:     Andreas Dilger <[email protected]>
 L:     [email protected]
@@ -2120,13 +2157,16 @@ F:      Documentation/filesystems/caching/
 F:     fs/fscache/
 F:     include/linux/fscache*.h
 
-FTRACE
+TRACING
 M:     Steven Rostedt <[email protected]>
+M:     Frederic Weisbecker <[email protected]>
+M:     Ingo Molnar <[email protected]>
+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 +2226,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 <[email protected]>
+L:     [email protected]
+L:     [email protected]
+S:     Supported
+F:     drivers/uio/uio_pci_generic.c
+
 GFS2 FILE SYSTEM
 M:     Steven Whitehouse <[email protected]>
 L:     [email protected]
@@ -2853,8 +2900,8 @@ F:        fs/jffs2/
 F:     include/linux/jffs2.h
 
 JOURNALLING LAYER FOR BLOCK DEVICES (JBD)
-M:     Stephen Tweedie <[email protected]>
 M:     Andrew Morton <[email protected]>
+M:     Jan Kara <[email protected]>
 L:     [email protected]
 S:     Maintained
 F:     fs/jbd*/
@@ -2926,6 +2973,7 @@ F:        include/linux/sunrpc/
 
 KERNEL VIRTUAL MACHINE (KVM)
 M:     Avi Kivity <[email protected]>
+M:     Marcelo Tosatti <[email protected]>
 L:     [email protected]
 W:     http://kvm.qumranet.com
 S:     Supported
@@ -3284,7 +3332,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 +4024,14 @@ S:       Maintained
 F:     drivers/block/pktcdvd.c
 F:     include/linux/pktcdvd.h
 
+PMC SIERRA MaxRAID DRIVER
+P:     Anil Ravindranath
+M:     [email protected]
+L:     [email protected]
+W:     http://www.pmc-sierra.com/
+S:     Supported
+F:     drivers/scsi/pmcraid.*
+
 POSIX CLOCKS and TIMERS
 M:     Thomas Gleixner <[email protected]>
 S:     Supported
@@ -4398,6 +4454,14 @@ S:       Maintained
 F:     kernel/sched*
 F:     include/linux/sched.h
 
+SCORE ARCHITECTURE
+P:     Chen Liqin
+M:     [email protected]
+P:     Lennox Wu
+M:     [email protected]
+W:     http://www.sunplusct.com
+S:     Supported
+
 SCSI CDROM DRIVER
 M:     Jens Axboe <[email protected]>
 L:     [email protected]
@@ -4414,7 +4478,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:     [email protected]
 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
@@ -4597,6 +4661,12 @@ F:       arch/arm/mach-s3c2410/
 F:     drivers/*/*s3c2410*
 F:     drivers/*/*/*s3c2410*
 
+TI DAVINCI MACHINE SUPPORT
+P:     Kevin Hilman
+M:     [email protected]
+S:     Supported
+F:     arch/arm/mach-davinci
+
 SIS 190 ETHERNET DRIVER
 M:     Francois Romieu <[email protected]>
 L:     [email protected]
@@ -4648,7 +4718,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.*
 
@@ -4976,6 +5046,11 @@ T:       quilt http://svn.sourceforge.jp/svnroot/tomoyo/trunk/2.2.x/tomoyo-lsm/patches
 S:     Maintained
 F:     security/tomoyo/
 
+TOPSTAR LAPTOP EXTRAS DRIVER
+M:     Herton Ronaldo Krzesinski <[email protected]>
+S:     Maintained
+F:     drivers/platform/x86/topstar-laptop.c
+
 TOSHIBA ACPI EXTRAS DRIVER
 S:     Orphan
 F:     drivers/platform/x86/toshiba_acpi.c
@@ -5621,6 +5696,26 @@ S:       Supported
 F:     drivers/input/touchscreen/*wm97*
 F:     include/linux/wm97xx.h
 
+WOLFSON MICROELECTRONICS PMIC DRIVERS
+P:     Mark Brown
+M:     [email protected]
+L:     [email protected]
+T:     git git://opensource.wolfsonmicro.com/linux-2.6-audioplus
+W:     http://opensource.wolfsonmicro.com/node/8
+S:     Supported
+F:     drivers/leds/leds-wm83*.c
+F:     drivers/mfd/wm8*.c
+F:     drivers/power/wm83*.c
+F:     drivers/rtc/rtc-wm83*.c
+F:     drivers/regulator/wm8*.c
+F:     drivers/video/backlight/wm83*_bl.c
+F:     drivers/watchdog/wm83*_wdt.c
+F:     include/linux/mfd/wm831x/
+F:     include/linux/mfd/wm8350/
+F:     include/linux/mfd/wm8400/
+F:     sound/soc/codecs/wm8350.c
+F:     sound/soc/codecs/wm8400.c
+
 X.25 NETWORK LAYER
 M:     Henner Eisen <[email protected]>
 L:     [email protected]
@@ -5653,7 +5748,7 @@ F:        include/xen/
 
 XFS FILESYSTEM
 P:     Silicon Graphics Inc
-M:     Felix Blyakher <felixb@sgi.com>
+M:     Alex Elder <aelder@sgi.com>
 M:     [email protected]
 L:     [email protected]
 W:     http://oss.sgi.com/projects/xfs