security: use mmap_min_addr indepedently of security models

[linux-3.10.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 9120f422ff3d5457ff9b0824cfb3d9f55d8e150d..2b349ba4add49640a52d55a66203fba46cf748e0 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -461,7 +461,7 @@ F:  arch/x86/include/asm/amd_iommu*.h
 
 AMD MICROCODE UPDATE SUPPORT
 P:     Andreas Herrmann
-M:     andeas.herrmann3@amd.com
+M:     andreas.herrmann3@amd.com
 L:     amd64-microcode@amd64.org
 S:     Supported
 F:     arch/x86/kernel/microcode_amd.c
@@ -543,6 +543,14 @@ S: Maintained
 F:     arch/arm/lib/floppydma.S
 F:     arch/arm/include/asm/floppy.h
 
+ARM PORT
+P:     Russell King
+M:     linux@arm.linux.org.uk
+L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+W:     http://www.arm.linux.org.uk/
+S:     Maintained
+F:     arch/arm/
+
 ARM PRIMECELL MMCI PL180/1 DRIVER
 S:     Orphan
 F:     drivers/mmc/host/mmci.*
@@ -592,6 +600,13 @@ M: kernel@wantstofly.org
 L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 S:     Maintained
 
+ARM/CLKDEV SUPPORT
+P:     Russell King
+M:     linux@arm.linux.org.uk
+L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+F:     arch/arm/common/clkdev.c
+F:     arch/arm/include/asm/clkdev.h
+
 ARM/COMPULAB CM-X270/EM-X270 and CM-X300 MACHINE SUPPORT
 P:     Mike Rapoport
 M:     mike@compulab.co.il
@@ -610,6 +625,15 @@ L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 T:     git git://gitorious.org/linux-gemini/mainline.git
 S:     Maintained
 
+ARM/EBSA110 MACHINE SUPPORT
+P:     Russell King
+M:     linux@arm.linux.org.uk
+L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+W:     http://www.arm.linux.org.uk/
+S:     Maintained
+F:     arch/arm/mach-ebsa110/
+F:     drivers/net/arm/am79c961a.*
+
 ARM/EZX SMARTPHONES (A780, A910, A1200, E680, ROKR E2 and ROKR E6)
 P:     Daniel Ribeiro
 M:     drwyrm@gmail.com
@@ -627,6 +651,15 @@ M: paulius.zaleckas@teltonika.lt
 L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 S:     Maintained
 
+ARM/FOOTBRIDGE ARCHITECTURE
+P:     Russell King
+M:     linux@arm.linux.org.uk
+L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+W:     http://www.arm.linux.org.uk/
+S:     Maintained
+F:     arch/arm/include/asm/hardware/dec21285.h
+F:     arch/arm/mach-footbridge/
+
 ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
 P:     Sascha Hauer
 M:     kernel@pengutronix.de
@@ -767,19 +800,27 @@ M:        kernel@wantstofly.org
 L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 S:     Maintained
 
+ARM/RISCPC ARCHITECTURE
+P:     Russell King
+M:     linux@arm.linux.org.uk
+L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+W:     http://www.arm.linux.org.uk/
+S:     Maintained
+F:     arch/arm/common/time-acorn.c
+F:     arch/arm/include/asm/hardware/entry-macro-iomd.S
+F:     arch/arm/include/asm/hardware/ioc.h
+F:     arch/arm/include/asm/hardware/iomd.h
+F:     arch/arm/include/asm/hardware/memc.h
+F:     arch/arm/mach-rpc/
+F:     drivers/net/arm/ether*
+F:     drivers/scsi/arm/
+
 ARM/SHARK MACHINE SUPPORT
 P:     Alexander Schulz
 M:     alex@shark-linux.de
 W:     http://www.shark-linux.de/shark.html
 S:     Maintained
 
-ARM/STRONGARM110 PORT
-P:     Russell King
-M:     rmk@arm.linux.org.uk
-L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
-W:     http://www.arm.linux.org.uk/
-S:     Maintained
-
 ARM/S3C2410 ARM ARCHITECTURE
 P:     Ben Dooks
 M:     ben-linux@fluff.org
@@ -813,6 +854,14 @@ L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 W:     http://www.mcuos.com
 S:     Maintained
 
+ARM/VFP SUPPORT
+P:     Russell King
+M:     linux@arm.linux.org.uk
+L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+W:     http://www.arm.linux.org.uk/
+S:     Maintained
+F:     arch/arm/vfp/
+
 ARPD SUPPORT
 P:     Jonathan Layes
 L:     netdev@vger.kernel.org
@@ -1238,6 +1287,14 @@ S:       Maintained
 F:     Documentation/video4linux/bttv/
 F:     drivers/media/video/bt8xx/bttv*
 
+CACHEFILES: FS-CACHE BACKEND FOR CACHING ON MOUNTED FILESYSTEMS
+P:     David Howells
+M:     dhowells@redhat.com
+L:     linux-cachefs@redhat.com
+S:     Supported
+F:     Documentation/filesystems/caching/cachefiles.txt
+F:     fs/cachefiles/
+
 CAFE CMOS INTEGRATED CAMERA CONTROLLER DRIVER
 P:     Jonathan Corbet
 M:     corbet@lwn.net
@@ -1280,12 +1337,9 @@ L:       cbe-oss-dev@ozlabs.org
 W:     http://www.ibm.com/developerworks/power/cell/
 S:     Supported
 F:     arch/powerpc/include/asm/cell*.h
-F:     arch/powerpc/include/asm/lv1call.h
-F:     arch/powerpc/include/asm/ps3*.h
 F:     arch/powerpc/include/asm/spu*.h
 F:     arch/powerpc/oprofile/*cell*
 F:     arch/powerpc/platforms/cell/
-F:     arch/powerpc/platforms/ps3/
 
 CERTIFIED WIRELESS USB (WUSB) SUBSYSTEM:
 P:     David Vrabel
@@ -1362,7 +1416,6 @@ M:        timur@freescale.com
 L:     alsa-devel@alsa-project.org
 S:     Supported
 F:     sound/soc/codecs/cs4270*
-F:     sound/soc/fsl/mpc8610_hpcd.c
 
 CIRRUS LOGIC CS4280/CS461x SOUNDDRIVER
 P:     Cirrus Logic Corporation (kernel 2.2 driver)
@@ -1373,6 +1426,11 @@ S:       Maintained
 F:     Documentation/input/cs461x.txt
 F:     sound/pci/cs46xx/
 
+CLK API
+P:     Russell King
+M:     linux@arm.linux.org.uk
+F:     include/linux/clk.h
+
 CODA FILE SYSTEM
 P:     Jan Harkes
 M:     jaharkes@cs.cmu.edu
@@ -1577,17 +1635,12 @@ F:      drivers/infiniband/hw/cxgb3/
 
 CYBERPRO FB DRIVER
 P:     Russell King
-M:     rmk@arm.linux.org.uk
+M:     linux@arm.linux.org.uk
+L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 W:     http://www.arm.linux.org.uk/
 S:     Maintained
 F:     drivers/video/cyber2000fb.*
 
-CYBLAFB FRAMEBUFFER DRIVER
-P:     Knut Petersen
-M:     Knut_Petersen@t-online.de
-L:     linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
-S:     Maintained
-
 CYCLADES 2X SYNC CARD DRIVER
 P:     Arnaldo Carvalho de Melo
 M:     acme@ghostprotocols.net
@@ -1828,7 +1881,7 @@ L:        linux-kernel@vger.kernel.org
 T:     quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/
 S:     Supported
 F:     Documentation/kobject.txt
-F:     drivers/base/core.c
+F:     drivers/base/
 F:     fs/sysfs/
 F:     include/linux/kobj*
 F:     lib/kobj*
@@ -1848,17 +1901,6 @@ L:       netdev@vger.kernel.org
 S:     Maintained
 F:     drivers/net/wan/dscc4.c
 
-DVB SUBSYSTEM AND DRIVERS
-P:     LinuxTV.org Project
-M:     linux-media@vger.kernel.org
-W:     http://linuxtv.org/
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
-S:     Maintained
-F:     Documentation/dvb/
-F:     drivers/media/dvb/
-F:     drivers/media/common/saa7146*.c
-F:     include/linux/dvb/
-
 DZ DECSTATION DZ11 SERIAL DRIVER
 P:     Maciej W. Rozycki
 M:     macro@linux-mips.org
@@ -1912,7 +1954,7 @@ F:        fs/ecryptfs/
 EDAC-CORE
 P:     Doug Thompson
 M:     dougthompson@xmission.com
-L:     bluesmoke-devel@lists.sourceforge.net
+L:     bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:     bluesmoke.sourceforge.net
 S:     Supported
 F:     Documentation/edac.txt
@@ -1924,7 +1966,7 @@ P:        Mark Gross
 P:     Doug Thompson
 M:     mark.gross@intel.com
 M:     dougthompson@xmission.com
-L:     bluesmoke-devel@lists.sourceforge.net
+L:     bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:     bluesmoke.sourceforge.net
 S:     Maintained
 F:     drivers/edac/e752x_edac.c
@@ -1932,7 +1974,7 @@ F:        drivers/edac/e752x_edac.c
 EDAC-E7XXX
 P:     Doug Thompson
 M:     dougthompson@xmission.com
-L:     bluesmoke-devel@lists.sourceforge.net
+L:     bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:     bluesmoke.sourceforge.net
 S:     Maintained
 F:     drivers/edac/e7xxx_edac.c
@@ -1940,7 +1982,7 @@ F:        drivers/edac/e7xxx_edac.c
 EDAC-I82443BXGX
 P:     Tim Small
 M:     tim@buttersideup.com
-L:     bluesmoke-devel@lists.sourceforge.net
+L:     bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:     bluesmoke.sourceforge.net
 S:     Maintained
 F:     drivers/edac/i82443bxgx_edac.c
@@ -1948,7 +1990,7 @@ F:        drivers/edac/i82443bxgx_edac.c
 EDAC-I3000
 P:     Jason Uhlenkott
 M:     juhlenko@akamai.com
-L:     bluesmoke-devel@lists.sourceforge.net
+L:     bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:     bluesmoke.sourceforge.net
 S:     Maintained
 F:     drivers/edac/i3000_edac.c
@@ -1956,7 +1998,7 @@ F:        drivers/edac/i3000_edac.c
 EDAC-I5000
 P:     Doug Thompson
 M:     dougthompson@xmission.com
-L:     bluesmoke-devel@lists.sourceforge.net
+L:     bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:     bluesmoke.sourceforge.net
 S:     Maintained
 F:     drivers/edac/i5000_edac.c
@@ -1964,7 +2006,7 @@ F:        drivers/edac/i5000_edac.c
 EDAC-I5400
 P:     Mauro Carvalho Chehab
 M:     mchehab@redhat.com
-L:     bluesmoke-devel@lists.sourceforge.net
+L:     bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:     bluesmoke.sourceforge.net
 S:     Maintained
 F:     drivers/edac/i5400_edac.c
@@ -1974,7 +2016,7 @@ P:        Ranganathan Desikan
 P:     Arvind R.
 M:     rdesikan@jetzbroadband.com
 M:     arvind@acarlab.com
-L:     bluesmoke-devel@lists.sourceforge.net
+L:     bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:     bluesmoke.sourceforge.net
 S:     Maintained
 F:     drivers/edac/i82975x_edac.c
@@ -1982,7 +2024,7 @@ F:        drivers/edac/i82975x_edac.c
 EDAC-PASEMI
 P:     Egor Martovetsky
 M:     egor@pasemi.com
-L:     bluesmoke-devel@lists.sourceforge.net
+L:     bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:     bluesmoke.sourceforge.net
 S:     Maintained
 F:     drivers/edac/pasemi_edac.c
@@ -1990,7 +2032,7 @@ F:        drivers/edac/pasemi_edac.c
 EDAC-R82600
 P:     Tim Small
 M:     tim@buttersideup.com
-L:     bluesmoke-devel@lists.sourceforge.net
+L:     bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:     bluesmoke.sourceforge.net
 S:     Maintained
 F:     drivers/edac/r82600_edac.c
@@ -2020,6 +2062,8 @@ F:        drivers/infiniband/hw/ehca/
 EMBEDDED LINUX
 P:     Paul Gortmaker
 M:     paul.gortmaker@windriver.com
+P:     Matt Mackall
+M:     mpm@selenic.com
 P:     David Woodhouse
 M:     dwmw2@infradead.org
 L:     linux-embedded@vger.kernel.org
@@ -2145,6 +2189,8 @@ P:        Riku Voipio
 M:     riku.vipio@iki.fi
 L:     lm-sensors@lm-sensors.org
 S:     Maintained
+F:     drivers/hwmon/f75375s.c
+F:     include/linux/f75375s.h
 
 FIREWIRE SUBSYSTEM
 P:     Kristian Hoegsberg
@@ -2167,8 +2213,8 @@ F:        include/linux/firmware.h
 
 FPU EMULATOR
 P:     Bill Metzenthen
-M:     billm@suburbia.net
-W:     http://suburbia.net/~billm/floating-point/emulator/
+M:     billm@melbpc.org.au
+W:     http://floatingpoint.sourceforge.net/emulator/index.html
 S:     Maintained
 F:     arch/x86/math-emu/
 
@@ -2265,7 +2311,8 @@ M:        timur@freescale.com
 L:     alsa-devel@alsa-project.org
 L:     linuxppc-dev@ozlabs.org
 S:     Supported
-F:     sound/soc/fsl/
+F:     sound/soc/fsl/fsl*
+F:     sound/soc/fsl/mpc8610_hpcd.c
 
 FREEVXFS FILESYSTEM
 P:     Christoph Hellwig
@@ -2285,6 +2332,15 @@ F:       Documentation/power/freezing-of-tasks.txt
 F:     include/linux/freezer.h
 F:     kernel/freezer.c
 
+FS-CACHE: LOCAL CACHING FOR NETWORK FILESYSTEMS
+P:     David Howells
+M:     dhowells@redhat.com
+L:     linux-cachefs@redhat.com
+S:     Supported
+F:     Documentation/filesystems/caching/
+F:     fs/fscache/
+F:     include/linux/fscache*.h
+
 FTRACE
 P:     Steven Rostedt
 M:     rostedt@goodmis.org
@@ -2300,7 +2356,6 @@ P:        David Howells
 M:     dhowells@redhat.com
 S:     Maintained
 F:     arch/frv/
-F:     include/asm-frv/
 
 FUJITSU LAPTOP EXTRAS
 P:     Jonathan Woithe
@@ -2506,7 +2561,6 @@ F:        kernel/power/
 F:     include/linux/suspend.h
 F:     include/linux/freezer.h
 F:     include/linux/pm.h
-F:     include/asm-*/suspend*.h
 F:     arch/*/include/asm/suspend*.h
 
 HID CORE LAYER
@@ -2608,8 +2662,8 @@ S:        Maintained
 F:     fs/hpfs/
 
 HSO 3G MODEM DRIVER
-P:     Denis Joseph Barrow
-M:     d.barow@option.com
+P:     Jan Dumon
+M:     j.dumon@option.com
 W:     http://www.pharscape.org
 S:     Maintained
 F:     drivers/net/usb/hso.c
@@ -2704,7 +2758,7 @@ IDE SUBSYSTEM
 P:     Bartlomiej Zolnierkiewicz
 M:     bzolnier@gmail.com
 L:     linux-ide@vger.kernel.org
-T:     quilt kernel.org/pub/linux/kernel/people/bart/pata-2.6/
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6.git
 S:     Maintained
 F:     Documentation/ide/
 F:     drivers/ide/
@@ -3155,7 +3209,7 @@ L:        kexec@lists.infradead.org
 L:     linux-kernel@vger.kernel.org
 W:     http://lse.sourceforge.net/kdump/
 S:     Maintained
-F:     Documentation/kdump
+F:     Documentation/kdump/
 
 KERNEL AUTOMOUNTER (AUTOFS)
 P:     H. Peter Anvin
@@ -3256,7 +3310,7 @@ W:        http://www.ibm.com/developerworks/linux/linux390/
 S:     Supported
 F:     Documentation/s390/kvm.txt
 F:     arch/s390/include/asm/kvm*
-F:     arch/s390/kvm
+F:     arch/s390/kvm/
 
 KEXEC
 P:     Eric Biederman
@@ -3284,7 +3338,7 @@ P:        Eduard - Gabriel Munteanu
 M:     eduard.munteanu@linux360.ro
 L:     linux-kernel@vger.kernel.org
 S:     Maintained
-F:     Documentation/vm/kmemtrace.txt
+F:     Documentation/trace/kmemtrace.txt
 F:     include/trace/kmemtrace.h
 F:     kernel/trace/kmemtrace.c
 
@@ -3362,12 +3416,6 @@ M:       paulus@au.ibm.com
 W:     http://www.ibm.com/linux/ltc/projects/ppc
 S:     Supported
 
-LINUX FOR NCR VOYAGER
-P:     James Bottomley
-M:     James.Bottomley@HansenPartnership.com
-W:     http://www.hansenpartnership.com/voyager
-S:     Maintained
-
 LINUX FOR POWERPC (32-BIT AND 64-BIT)
 P:     Benjamin Herrenschmidt
 M:     benh@kernel.crashing.org
@@ -3386,11 +3434,10 @@ L:      linuxppc-dev@ozlabs.org
 S:     Maintained
 
 LINUX FOR POWERPC EMBEDDED MPC5XXX
-P:     Sylvain Munaut
-M:     tnt@246tNt.com
 P:     Grant Likely
 M:     grant.likely@secretlab.ca
 L:     linuxppc-dev@ozlabs.org
+T:     git git://git.secretlab.ca/git/linux-2.6.git
 S:     Maintained
 
 LINUX FOR POWERPC EMBEDDED PPC4XX
@@ -3400,7 +3447,7 @@ P:        Matt Porter
 M:     mporter@kernel.crashing.org
 W:     http://www.penguinppc.org/
 L:     linuxppc-dev@ozlabs.org
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git
 S:     Maintained
 
 LINUX FOR POWERPC EMBEDDED XILINX VIRTEX
@@ -3408,6 +3455,7 @@ P:        Grant Likely
 M:     grant.likely@secretlab.ca
 W:     http://wiki.secretlab.ca/index.php/Linux_on_Xilinx_Virtex
 L:     linuxppc-dev@ozlabs.org
+T:     git git://git.secretlab.ca/git/linux-2.6.git
 S:     Maintained
 
 LINUX FOR POWERPC EMBEDDED PPC8XX
@@ -3540,6 +3588,7 @@ W:        http://www.linux-m68k.org/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git
 S:     Maintained
 F:     arch/m68k/
+F:     drivers/zorro/
 
 M68K ON APPLE MACINTOSH
 P:     Joshua Thompson
@@ -3547,6 +3596,7 @@ M:        funaho@jurai.org
 W:     http://www.mac.linux-m68k.org/
 L:     linux-m68k@lists.linux-m68k.org
 S:     Maintained
+F:     arch/m68k/mac/
 
 M68K ON HP9000/300
 P:     Philip Blundell
@@ -3637,6 +3687,21 @@ S:       Maintained
 F:     Documentation/hwmon/max6650
 F:     drivers/hwmon/max6650.c
 
+MEDIA INPUT INFRASTRUCTURE (V4L/DVB)
+P:     Mauro Carvalho Chehab
+M:     mchehab@infradead.org
+P:     LinuxTV.org Project
+L:     linux-media@vger.kernel.org
+W:     http://linuxtv.org
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
+S:     Maintained
+F:     Documentation/dvb/
+F:     Documentation/video4linux/
+F:     drivers/media/
+F:     include/media/
+F:     include/linux/dvb/
+F:     include/linux/videodev*.h
+
 MEGARAID SCSI DRIVERS
 P:     Neela Syam Kolli
 M:     megaraidlinux@lsi.com
@@ -3678,6 +3743,15 @@ F:       drivers/mtd/
 F:     include/linux/mtd/
 F:     include/mtd/
 
+MICROBLAZE ARCHITECTURE
+P:     Michal Simek
+M:     monstr@monstr.eu
+L:     microblaze-uclinux@itee.uq.edu.au
+W:     http://www.monstr.eu/fdt/
+T:     git git://git.monstr.eu/linux-2.6-microblaze.git
+S:     Supported
+F:     arch/microblaze/
+
 MICROTEK X6 SCANNER
 P:     Oliver Neukum
 M:     oliver@neukum.name
@@ -3891,7 +3965,7 @@ M:        paul.moore@hp.com
 W:     http://netlabel.sf.net
 L:     netdev@vger.kernel.org
 S:     Supported
-F:     Documentation/netlabel
+F:     Documentation/netlabel/
 F:     include/net/netlabel.h
 F:     net/netlabel/
 
@@ -3913,19 +3987,12 @@ F:      Documentation/blockdev/nbd.txt
 F:     drivers/block/nbd.c
 F:     include/linux/nbd.h
 
-NETWORK DEVICE DRIVERS
-P:     Jeff Garzik
-M:     jgarzik@pobox.com
-L:     netdev@vger.kernel.org
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git
-S:     Maintained
-F:     drivers/net/
-
 NETWORKING [GENERAL]
-P:     Networking Team
-M:     netdev@vger.kernel.org
+P:     David S. Miller
+M:     davem@davemloft.net
 L:     netdev@vger.kernel.org
-W:     http://linux-net.osdl.org/
+W:     http://www.linuxfoundation.org/en/Net
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git
 S:     Maintained
 F:     net/
 F:     include/net/
@@ -3966,6 +4033,13 @@ F:       net/wireless/
 F:     include/net/ieee80211*
 F:     include/net/wireless.h
 
+NETWORKING DRIVERS
+L:     netdev@vger.kernel.org
+W:     http://www.linuxfoundation.org/en/Net
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git
+S:     Odd Fixes
+F:     drivers/net/
+
 NETXEN (1/10) GbE SUPPORT
 P:     Dhananjay Phadke
 M:     dhananjay@netxen.com
@@ -4115,7 +4189,7 @@ P:        Joel Becker
 M:     joel.becker@oracle.com
 L:     ocfs2-devel@oss.oracle.com (moderated for non-subscribers)
 W:     http://oss.oracle.com/projects/ocfs2/
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2.git
 S:     Supported
 F:     Documentation/filesystems/ocfs2.txt
 F:     Documentation/filesystems/dlmfs.txt
@@ -4182,7 +4256,6 @@ W:        ftp://ftp.redhat.com/pub/redhat/gnupro/AM33/
 S:     Maintained
 F:     Documentation/mn10300/
 F:     arch/mn10300/
-F:     include/asm-mn10300/
 
 PARALLEL PORT SUPPORT
 L:     linux-parport@lists.infradead.org (subscribers-only)
@@ -4247,6 +4320,8 @@ PCA9532 LED DRIVER
 P:     Riku Voipio
 M:     riku.voipio@iki.fi
 S:     Maintained
+F:     drivers/leds/leds-pca9532.c
+F:     include/linux/leds-pca9532.h
 
 PCI ERROR RECOVERY
 P:     Linas Vepstas
@@ -4436,7 +4511,9 @@ F:        arch/powerpc/include/asm/ps3*.h
 F:     arch/powerpc/platforms/ps3/
 F:     drivers/*/ps3*
 F:     drivers/ps3/
+F:     drivers/rtc/rtc-ps3.c
 F:     drivers/usb/host/*ps3.c
+F:     sound/ppc/snd_ps3*
 
 PS3VRAM DRIVER
 P:     Jim Paris
@@ -4444,6 +4521,19 @@ M:       jim@jtan.com
 L:     cbe-oss-dev@ozlabs.org
 S:     Maintained
 
+PTRACE SUPPORT
+P:     Roland McGrath
+M:     roland@redhat.com
+P:     Oleg Nesterov
+M:     oleg@redhat.com
+L:     linux-kernel@vger.kernel.org
+S:     Maintained
+F:     include/asm-generic/syscall.h
+F:     include/linux/ptrace.h
+F:     include/linux/regset.h
+F:     include/linux/tracehook.h
+F:     kernel/ptrace.c
+
 PVRUSB2 VIDEO4LINUX DRIVER
 P:     Mike Isely
 M:     isely@pobox.com
@@ -4524,7 +4614,7 @@ M:        al@alarsen.net
 L:     linux-kernel@vger.kernel.org
 W:     http://www.alarsen.net/linux/qnx4fs/
 S:     Maintained
-F:     fs/qnx4
+F:     fs/qnx4/
 F:     include/linux/qnx4_fs.h
 F:     include/linux/qnxtypes.h
 
@@ -4589,13 +4679,13 @@ F:      kernel/rcutorture.c
 
 RDC R-321X SoC
 P:     Florian Fainelli
-M:     florian.fainelli@telecomint.eu
+M:     florian@openwrt.org
 L:     linux-kernel@vger.kernel.org
 S:     Maintained
 
 RDC R6040 FAST ETHERNET DRIVER
 P:     Florian Fainelli
-M:     florian.fainelli@telecomint.eu
+M:     florian@openwrt.org
 L:     netdev@vger.kernel.org
 S:     Maintained
 F:     drivers/net/r6040.c
@@ -4647,7 +4737,8 @@ P:        Ivo van Doorn
 M:     IvDoorn@gmail.com
 L:     netdev@vger.kernel.org
 S:     Maintained
-F:     net/rfkill
+F      Documentation/rfkill.txt
+F:     net/rfkill/
 
 RISCOM8 DRIVER
 S:     Orphan
@@ -4730,6 +4821,7 @@ M:        ralph.wuerthner@de.ibm.com
 M:     linux390@de.ibm.com
 L:     linux-s390@vger.kernel.org
 S:     Supported
+F:     drivers/s390/crypto/
 
 S390 ZFCP DRIVER
 P:     Christof Schmitt
@@ -4926,6 +5018,9 @@ M:        jgarzik@pobox.com
 L:     linux-ide@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev.git
 S:     Supported
+F:     drivers/ata/
+F:     include/linux/ata.h
+F:     include/linux/libata.h
 
 SERVER ENGINES 10Gbps NIC - BladeEngine 2 DRIVER
 P:     Sathya Perla
@@ -4969,8 +5064,8 @@ S:        Maintained for 2.6.
 F:     Documentation/sgi-visws.txt
 
 SGI XP/XPC/XPNET DRIVER
-P:     Dean Nelson
-M:     dcn@sgi.com
+P:     Robin Holt
+M:     holt@sgi.com
 S:     Maintained
 F:     drivers/misc/sgi-xp/
 
@@ -5177,7 +5272,12 @@ M:       perex@perex.cz
 P:     Takashi Iwai
 M:     tiwai@suse.de
 L:     alsa-devel@alsa-project.org (subscribers-only)
+W:     http://www.alsa-project.org/
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git
+T:     git git://git.alsa-project.org/alsa-kernel.git
 S:     Maintained
+F:     Documentation/sound/
+F:     include/sound/
 F:     sound/
 
 SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC)
@@ -5304,7 +5404,9 @@ L:        linux-sh@vger.kernel.org
 W:     http://www.linux-sh.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git
 S:     Supported
+F:     Documentation/sh/
 F:     arch/sh/
+F:     drivers/sh/
 
 SUSPEND TO RAM
 P:     Len Brown
@@ -5322,7 +5424,6 @@ F:        kernel/power/
 F:     include/linux/suspend.h
 F:     include/linux/freezer.h
 F:     include/linux/pm.h
-F:     include/asm-*/suspend.h
 
 SVGA HANDLING
 P:     Martin Mares
@@ -5476,6 +5577,7 @@ TMIO MMC DRIVER
 P:     Ian Molton
 M:     ian@mnementh.co.uk
 S:     Maintained
+F:     drivers/mmc/host/tmio_mmc.*
 
 TPM DEVICE DRIVER
 P:     Debora Velarde
@@ -5555,7 +5657,7 @@ L:        uclinux-dev@uclinux.org  (subscribers-only)
 S:     Maintained
 F:     arch/m68knommu/
 
-UCLINUX FOR RENESAS H8/300
+UCLINUX FOR RENESAS H8/300 (H8300)
 P:     Yoshinori Sato
 M:     ysato@users.sourceforge.jp
 W:     http://uclinux-h8.sourceforge.jp/
@@ -5603,7 +5705,7 @@ W:        http://www.linux-mtd.infradead.org/
 L:     linux-mtd@lists.infradead.org
 T:     git git://git.infradead.org/ubi-2.6.git
 S:     Maintained
-F:     drivers/mtd/ubi
+F:     drivers/mtd/ubi/
 F:     include/linux/mtd/ubi.h
 F:     include/mtd/ubi-user.h
 
@@ -6019,20 +6121,6 @@ L:       netdev@vger.kernel.org
 S:     Maintained
 F:     drivers/net/via-velocity.*
 
-VIDEO FOR LINUX (V4L)
-P:     Mauro Carvalho Chehab
-M:     mchehab@infradead.org
-L:     linux-media@vger.kernel.org
-W:     http://linuxtv.org
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
-S:     Maintained
-F:     Documentation/video4linux/
-F:     drivers/media/video/
-F:     drivers/media/radio/
-F:     include/linux/videodev.h
-F:     include/linux/videodev2.h
-F:     include/media/
-
 VLAN (802.1Q)
 P:     Patrick McHardy
 M:     kaber@trash.net