UBIFS: switch to RO mode after synchronizing

[linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 02f75fccac20915ae4c7aad6b333ed0061f90e44..c36f5d76e1a2e659db6c4f2e6f243df640c088d2 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -313,11 +313,9 @@ S: Maintained
 F:     drivers/hwmon/adm1029.c
 
 ADM8211 WIRELESS DRIVER
-M:     Michael Wu <[email protected]>
 L:     [email protected]
 W:     http://linuxwireless.org/
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mwu/mac80211-drivers.git
-S:     Maintained
+S:     Orphan
 F:     drivers/net/wireless/adm8211.*
 
 ADT746X FAN DRIVER
@@ -456,9 +454,20 @@ L: [email protected]
 S:     Maintained
 F:     drivers/infiniband/hw/amso1100/
 
+ANALOG DEVICES INC ASOC DRIVERS
+L:     [email protected]
+L:     [email protected] (moderated for non-subscribers)
+W:     http://blackfin.uclinux.org/
+S:     Supported
+F:     sound/soc/blackfin/*
+F:     sound/soc/codecs/ad1*
+F:     sound/soc/codecs/adau*
+F:     sound/soc/codecs/adav*
+F:     sound/soc/codecs/ssm*
+
 AOA (Apple Onboard Audio) ALSA DRIVER
 M:     Johannes Berg <[email protected]>
-L:     [email protected]
+L:     linuxppc-dev@lists.ozlabs.org
 L:     [email protected] (moderated for non-subscribers)
 S:     Maintained
 F:     sound/aoa/
@@ -576,7 +585,6 @@ 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/CAVIUM NETWORKS CNS3XXX MACHINE SUPPORT
@@ -619,10 +627,10 @@ M:        Richard Purdie <[email protected]>
 S:     Maintained
 
 ARM/CORTINA SYSTEMS GEMINI ARM ARCHITECTURE
-M:     Paulius Zaleckas <paulius.zaleckas@gmail.com>
+M:     Hans Ulli Kroll <ulli.kroll@googlemail.com>
 L:     [email protected] (moderated for non-subscribers)
-T:     git git://gitorious.org/linux-gemini/mainline.git
-S:     Odd Fixes
+T:     git git://git.berlios.de/gemini-board
+S:     Maintained
 F:     arch/arm/mach-gemini/
 
 ARM/EBSA110 MACHINE SUPPORT
@@ -644,9 +652,10 @@ T: topgit git://git.openezx.org/openezx.git
 F:     arch/arm/mach-pxa/ezx.c
 
 ARM/FARADAY FA526 PORT
-M:     Paulius Zaleckas <paulius.zaleckas@gmail.com>
+M:     Hans Ulli Kroll <ulli.kroll@googlemail.com>
 L:     [email protected] (moderated for non-subscribers)
-S:     Odd Fixes
+S:     Maintained
+T:     git://git.berlios.de/gemini-board
 F:     arch/arm/mm/*-fa*
 
 ARM/FOOTBRIDGE ARCHITECTURE
@@ -695,6 +704,13 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/kristoffer/linux-hpc.git
 F:     arch/arm/mach-sa1100/jornada720.c
 F:     arch/arm/mach-sa1100/include/mach/jornada720.h
 
+ARM/INCOME PXA270 SUPPORT
+M:     Marek Vasut <[email protected]>
+L:     [email protected] (moderated for non-subscribers)
+S:     Maintained
+F:     arch/arm/mach-pxa/income.c
+F:     arch/arm/mach-pxa/include/mach-pxa/income.h
+
 ARM/INTEL IOP32X ARM ARCHITECTURE
 M:     Lennert Buytenhek <[email protected]>
 M:     Dan Williams <[email protected]>
@@ -950,8 +966,9 @@ ARM/SHMOBILE ARM ARCHITECTURE
 M:     Paul Mundt <[email protected]>
 M:     Magnus Damm <[email protected]>
 L:     [email protected]
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/genesis-2.6.git
 W:     http://oss.renesas.com
+Q:     http://patchwork.kernel.org/project/linux-sh/list/
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/genesis-2.6.git
 S:     Supported
 F:     arch/arm/mach-shmobile/
 F:     drivers/sh/
@@ -977,12 +994,11 @@ F:        drivers/input/keyboard/w90p910_keypad.c
 F:     drivers/input/touchscreen/w90p910_ts.c
 F:     drivers/watchdog/nuc900_wdt.c
 F:     drivers/net/arm/w90p910_ether.c
-F:     drivers/mtd/nand/w90p910_nand.c
+F:     drivers/mtd/nand/nuc900_nand.c
 F:     drivers/rtc/rtc-nuc900.c
 F:     drivers/spi/spi_nuc900.c
 F:     drivers/usb/host/ehci-w90x900.c
 F:     drivers/video/nuc900fb.c
-F:     drivers/sound/soc/nuc900/
 
 ARM/U300 MACHINE SUPPORT
 M:     Linus Walleij <[email protected]>
@@ -1012,14 +1028,14 @@ M:      Marek Vasut <[email protected]>
 L:     [email protected] (moderated for non-subscribers)
 S:     Maintained
 F:     arch/arm/mach-pxa/vpac270.c
-F:     arch/arm/mach-pxa/include/mach-pxa/vpac270.h
+F:     arch/arm/mach-pxa/include/mach/vpac270.h
 
 ARM/ZIPIT Z2 SUPPORT
 M:     Marek Vasut <[email protected]>
 L:     [email protected] (moderated for non-subscribers)
 S:     Maintained
 F:     arch/arm/mach-pxa/z2.c
-F:     arch/arm/mach-pxa/include/mach-pxa/z2.h
+F:     arch/arm/mach-pxa/include/mach/z2.h
 
 ASC7621 HARDWARE MONITOR DRIVER
 M:     George Joseph <[email protected]>
@@ -1089,7 +1105,6 @@ F:        drivers/net/wireless/ath/ath5k/
 ATHEROS ATH9K WIRELESS DRIVER
 M:     "Luis R. Rodriguez" <[email protected]>
 M:     Jouni Malinen <[email protected]>
-M:     Sujith Manoharan <[email protected]>
 M:     Vasanthakumar Thiagarajan <[email protected]>
 M:     Senthil Balasubramanian <[email protected]>
 L:     [email protected]
@@ -1255,8 +1270,7 @@ S:        Maintained
 F:     drivers/net/hamradio/baycom*
 
 BEFS FILE SYSTEM
-M:     "Sergey S. Kostyliov" <[email protected]>
-S:     Maintained
+S:     Orphan
 F:     Documentation/filesystems/befs.txt
 F:     fs/befs/
 
@@ -1369,7 +1383,7 @@ BROADCOM BNX2X 10 GIGABIT ETHERNET DRIVER
 M:     Eilon Greenstein <[email protected]>
 L:     [email protected]
 S:     Supported
-F:     drivers/net/bnx2x*
+F:     drivers/net/bnx2x/
 
 BROADCOM TG3 GIGABIT ETHERNET DRIVER
 M:     Matt Carlson <[email protected]>
@@ -1469,8 +1483,8 @@ F:        include/linux/can/platform/
 
 CELL BROADBAND ENGINE ARCHITECTURE
 M:     Arnd Bergmann <[email protected]>
-L:     [email protected]
-L:     [email protected]
+L:     linuxppc-dev@lists.ozlabs.org
+L:     cbe-oss-dev@lists.ozlabs.org
 W:     http://www.ibm.com/developerworks/power/cell/
 S:     Supported
 F:     arch/powerpc/include/asm/cell*.h
@@ -1571,6 +1585,16 @@ L:       [email protected]
 S:     Supported
 F:     drivers/platform/x86/classmate-laptop.c
 
+COCCINELLE/Semantic Patches (SmPL)
+M:     Julia Lawall <[email protected]>
+M:     Gilles Muller <[email protected]>
+M:     Nicolas Palix <[email protected]>
+L:     [email protected] (moderated for non-subscribers)
+W:     http://coccinelle.lip6.fr/
+S:     Supported
+F:     scripts/coccinelle/
+F:     scripts/coccicheck
+
 CODA FILE SYSTEM
 M:     Jan Harkes <[email protected]>
 M:     [email protected]
@@ -1652,8 +1676,7 @@ F:        kernel/cgroup*
 F:     mm/*cgroup*
 
 CORETEMP HARDWARE MONITORING DRIVER
-M:     Rudolf Marek <[email protected]>
-M:     Huaxu Wan <[email protected]>
+M:     Fenghua Yu <[email protected]>
 L:     [email protected]
 S:     Maintained
 F:     Documentation/hwmon/coretemp
@@ -1726,6 +1749,8 @@ CRYPTOGRAPHIC RANDOM NUMBER GENERATOR
 M:     Neil Horman <[email protected]>
 L:     [email protected]
 S:     Maintained
+F:     crypto/ansi_cprng.c
+F:     crypto/rng.c
 
 CS5535 Audio ALSA driver
 M:     Jaya Kumar <[email protected]>
@@ -1771,6 +1796,13 @@ W:       http://www.openfabrics.org
 S:     Supported
 F:     drivers/infiniband/hw/cxgb4/
 
+CXGB4VF ETHERNET DRIVER (CXGB4VF)
+M:     Casey Leedom <[email protected]>
+L:     [email protected]
+W:     http://www.chelsio.com
+S:     Supported
+F:     drivers/net/cxgb4vf/
+
 CYBERPRO FB DRIVER
 M:     Russell King <[email protected]>
 L:     [email protected] (moderated for non-subscribers)
@@ -1877,6 +1909,7 @@ F:        drivers/firmware/dcdbas.*
 DELL WMI EXTRAS DRIVER
 M:     Matthew Garrett <[email protected]>
 S:     Maintained
+F:     drivers/platform/x86/dell-wmi.c
 
 DEVICE NUMBER REGISTRY
 M:     Torben Mathiasen <[email protected]>
@@ -2006,6 +2039,7 @@ L:        [email protected]
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git
 S:     Maintained
 F:     drivers/gpu/drm/
+F:     include/drm/
 
 DSCC4 DRIVER
 M:     Francois Romieu <[email protected]>
@@ -2188,6 +2222,12 @@ F:       drivers/misc/cb710/
 F:     drivers/mmc/host/cb710-mmc.*
 F:     include/linux/cb710.h
 
+ENE KB2426 (ENE0100/ENE020XX) INFRARED RECEIVER
+M:     Maxim Levitsky <[email protected]>
+S:     Maintained
+F:     drivers/media/IR/ene_ir.c
+F:     drivers/media/IR/ene_ir.h
+
 EPSON 1355 FRAMEBUFFER DRIVER
 M:     Christopher Hoover <[email protected]>
 M:     Christopher Hoover <[email protected]>
@@ -2222,6 +2262,7 @@ S:        Maintained
 F:     drivers/net/eth16i.c
 
 EXT2 FILE SYSTEM
+M:     Jan Kara <[email protected]>
 L:     [email protected]
 S:     Maintained
 F:     Documentation/filesystems/ext2.txt
@@ -2229,8 +2270,9 @@ F:        fs/ext2/
 F:     include/linux/ext2*
 
 EXT3 FILE SYSTEM
+M:     Jan Kara <[email protected]>
 M:     Andrew Morton <[email protected]>
-M:     Andreas Dilger <adilger@sun.com>
+M:     Andreas Dilger <adilger[email protected]>
 L:     [email protected]
 S:     Maintained
 F:     Documentation/filesystems/ext3.txt
@@ -2239,7 +2281,7 @@ F:        include/linux/ext3*
 
 EXT4 FILE SYSTEM
 M:     "Theodore Ts'o" <[email protected]>
-M:     Andreas Dilger <adilger@sun.com>
+M:     Andreas Dilger <adilger[email protected]>
 L:     [email protected]
 W:     http://ext4.wiki.kernel.org
 Q:     http://patchwork.ozlabs.org/project/linux-ext4/list/
@@ -2254,6 +2296,12 @@ S:       Maintained
 F:     Documentation/hwmon/f71805f
 F:     drivers/hwmon/f71805f.c
 
+FANOTIFY
+M:     Eric Paris <[email protected]>
+S:     Maintained
+F:     fs/notify/fanotify/
+F:     include/linux/fanotify.h
+
 FARSYNC SYNCHRONOUS DRIVER
 M:     Kevin Curtis <[email protected]>
 W:     http://www.farsite.co.uk/
@@ -2307,6 +2355,7 @@ T:        git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git
 S:     Maintained
 F:     drivers/firewire/
 F:     include/linux/firewire*.h
+F:     tools/firewire/
 
 FIRMWARE LOADER (request_firmware)
 S:     Orphan
@@ -2338,13 +2387,13 @@ F:      include/linux/fb.h
 FREESCALE DMA DRIVER
 M:     Li Yang <[email protected]>
 M:     Zhang Wei <[email protected]>
-L:     [email protected]
+L:     linuxppc-dev@lists.ozlabs.org
 S:     Maintained
 F:     drivers/dma/fsldma.*
 
 FREESCALE I2C CPM DRIVER
 M:     Jochen Friedrich <[email protected]>
-L:     [email protected]
+L:     linuxppc-dev@lists.ozlabs.org
 L:     [email protected]
 S:     Maintained
 F:     drivers/i2c/busses/i2c-cpm.c
@@ -2360,7 +2409,7 @@ F:        drivers/video/imxfb.c
 FREESCALE SOC FS_ENET DRIVER
 M:     Pantelis Antoniou <[email protected]>
 M:     Vitaly Bordug <[email protected]>
-L:     [email protected]
+L:     linuxppc-dev@lists.ozlabs.org
 L:     [email protected]
 S:     Maintained
 F:     drivers/net/fs_enet/
@@ -2368,7 +2417,7 @@ F:        include/linux/fs_enet_pd.h
 
 FREESCALE QUICC ENGINE LIBRARY
 M:     Timur Tabi <[email protected]>
-L:     [email protected]
+L:     linuxppc-dev@lists.ozlabs.org
 S:     Supported
 F:     arch/powerpc/sysdev/qe_lib/
 F:     arch/powerpc/include/asm/*qe.h
@@ -2376,27 +2425,27 @@ F:      arch/powerpc/include/asm/*qe.h
 FREESCALE USB PERIPHERAL DRIVERS
 M:     Li Yang <[email protected]>
 L:     [email protected]
-L:     [email protected]
+L:     linuxppc-dev@lists.ozlabs.org
 S:     Maintained
 F:     drivers/usb/gadget/fsl*
 
 FREESCALE QUICC ENGINE UCC ETHERNET DRIVER
 M:     Li Yang <[email protected]>
 L:     [email protected]
-L:     [email protected]
+L:     linuxppc-dev@lists.ozlabs.org
 S:     Maintained
 F:     drivers/net/ucc_geth*
 
 FREESCALE QUICC ENGINE UCC UART DRIVER
 M:     Timur Tabi <[email protected]>
-L:     [email protected]
+L:     linuxppc-dev@lists.ozlabs.org
 S:     Supported
 F:     drivers/serial/ucc_uart.c
 
 FREESCALE SOC SOUND DRIVERS
 M:     Timur Tabi <[email protected]>
 L:     [email protected] (moderated for non-subscribers)
-L:     [email protected]
+L:     linuxppc-dev@lists.ozlabs.org
 S:     Supported
 F:     sound/soc/fsl/fsl*
 F:     sound/soc/fsl/mpc8610_hpcd.c
@@ -2531,7 +2580,7 @@ F:        mm/memory-failure.c
 F:     mm/hwpoison-inject.c
 
 HYPERVISOR VIRTUAL CONSOLE DRIVER
-L:     [email protected]
+L:     linuxppc-dev@lists.ozlabs.org
 S:     Odd Fixes
 F:     drivers/char/hvc_*
 
@@ -2620,6 +2669,14 @@ S:       Maintained
 F:     Documentation/blockdev/cpqarray.txt
 F:     drivers/block/cpqarray.*
 
+HEWLETT-PACKARD SMART ARRAY RAID DRIVER (hpsa)
+M:     Stephen M. Cameron <[email protected]>
+L:     [email protected]
+S:     Supported
+F:     Documentation/scsi/hpsa.txt
+F:     drivers/scsi/hpsa*.[ch]
+F:     include/linux/cciss*.h
+
 HEWLETT-PACKARD SMART CISS RAID DRIVER (cciss)
 M:     Mike Miller <[email protected]>
 L:     [email protected]
@@ -3184,6 +3241,13 @@ F:       Documentation/video4linux/*.ivtv
 F:     drivers/media/video/ivtv/
 F:     include/linux/ivtv*
 
+JC42.4 TEMPERATURE SENSOR DRIVER
+M:     Guenter Roeck <[email protected]>
+L:     [email protected]
+S:     Maintained
+F:     drivers/hwmon/jc42.c
+F:     Documentation/hwmon/jc42
+
 JFS FILESYSTEM
 M:     Dave Kleikamp <[email protected]>
 L:     [email protected]
@@ -3253,8 +3317,8 @@ F:        fs/autofs4/
 
 KERNEL BUILD + files below scripts/ (unless maintained elsewhere)
 M:     Michal Marek <[email protected]>
-T:     git git://repo.or.cz/linux-kbuild.git for-next
-T:     git git://repo.or.cz/linux-kbuild.git for-linus
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6.git for-next
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6.git rc-fixes
 L:     [email protected]
 S:     Maintained
 F:     Documentation/kbuild/
@@ -3380,13 +3444,6 @@ F:       include/linux/kmemleak.h
 F:     mm/kmemleak.c
 F:     mm/kmemleak-test.c
 
-KMEMTRACE
-M:     Eduard - Gabriel Munteanu <[email protected]>
-S:     Maintained
-F:     Documentation/trace/kmemtrace.txt
-F:     include/linux/kmemtrace.h
-F:     kernel/trace/kmemtrace.c
-
 KPROBES
 M:     Ananth N Mavinakayanahalli <[email protected]>
 M:     Anil S Keshavamurthy <[email protected]>
@@ -3435,9 +3492,9 @@ F:        drivers/usb/misc/legousbtower.c
 
 LGUEST
 M:     Rusty Russell <[email protected]>
-L:     [email protected]
+L:     lguest@lists.ozlabs.org
 W:     http://lguest.ozlabs.org/
-S:     Maintained
+S:     Odd Fixes
 F:     Documentation/lguest/
 F:     arch/x86/lguest/
 F:     drivers/lguest/
@@ -3454,7 +3511,7 @@ LINUX FOR POWERPC (32-BIT AND 64-BIT)
 M:     Benjamin Herrenschmidt <[email protected]>
 M:     Paul Mackerras <[email protected]>
 W:     http://www.penguinppc.org/
-L:     [email protected]
+L:     linuxppc-dev@lists.ozlabs.org
 Q:     http://patchwork.ozlabs.org/project/linuxppc-dev/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git
 S:     Supported
@@ -3464,14 +3521,14 @@ F:      arch/powerpc/
 LINUX FOR POWER MACINTOSH
 M:     Benjamin Herrenschmidt <[email protected]>
 W:     http://www.penguinppc.org/
-L:     [email protected]
+L:     linuxppc-dev@lists.ozlabs.org
 S:     Maintained
 F:     arch/powerpc/platforms/powermac/
 F:     drivers/macintosh/
 
 LINUX FOR POWERPC EMBEDDED MPC5XXX
 M:     Grant Likely <[email protected]>
-L:     [email protected]
+L:     linuxppc-dev@lists.ozlabs.org
 T:     git git://git.secretlab.ca/git/linux-2.6.git
 S:     Maintained
 F:     arch/powerpc/platforms/512x/
@@ -3481,7 +3538,7 @@ LINUX FOR POWERPC EMBEDDED PPC4XX
 M:     Josh Boyer <[email protected]>
 M:     Matt Porter <[email protected]>
 W:     http://www.penguinppc.org/
-L:     [email protected]
+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/
@@ -3490,7 +3547,7 @@ F:        arch/powerpc/platforms/44x/
 LINUX FOR POWERPC EMBEDDED XILINX VIRTEX
 M:     Grant Likely <[email protected]>
 W:     http://wiki.secretlab.ca/index.php/Linux_on_Xilinx_Virtex
-L:     [email protected]
+L:     linuxppc-dev@lists.ozlabs.org
 T:     git git://git.secretlab.ca/git/linux-2.6.git
 S:     Maintained
 F:     arch/powerpc/*/*virtex*
@@ -3500,19 +3557,20 @@ LINUX FOR POWERPC EMBEDDED PPC8XX
 M:     Vitaly Bordug <[email protected]>
 M:     Marcelo Tosatti <[email protected]>
 W:     http://www.penguinppc.org/
-L:     [email protected]
+L:     linuxppc-dev@lists.ozlabs.org
 S:     Maintained
+F:     arch/powerpc/platforms/8xx/
 
 LINUX FOR POWERPC EMBEDDED PPC83XX AND PPC85XX
 M:     Kumar Gala <[email protected]>
 W:     http://www.penguinppc.org/
-L:     [email protected]
+L:     linuxppc-dev@lists.ozlabs.org
 S:     Maintained
 F:     arch/powerpc/platforms/83xx/
 
 LINUX FOR POWERPC PA SEMI PWRFICIENT
 M:     Olof Johansson <[email protected]>
-L:     [email protected]
+L:     linuxppc-dev@lists.ozlabs.org
 S:     Maintained
 F:     arch/powerpc/platforms/pasemi/
 F:     drivers/*/*pasemi*
@@ -3604,7 +3662,7 @@ M:        Mike Frysinger <[email protected]>
 M:     Subrata Modak <[email protected]>
 L:     [email protected] (subscribers-only)
 W:     http://ltp.sourceforge.net/
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/galak/ltp.git
+T:     git git://ltp.git.sourceforge.net/gitroot/ltp/ltp-dev
 S:     Maintained
 
 M32R ARCHITECTURE
@@ -3686,7 +3744,7 @@ F:        include/linux/mv643xx.h
 MARVELL MWL8K WIRELESS DRIVER
 M:     Lennert Buytenhek <[email protected]>
 L:     [email protected]
-S:     Maintained
+S:     Odd Fixes
 F:     drivers/net/wireless/mwl8k.c
 
 MARVELL SOC MMC/SD/SDIO CONTROLLER DRIVER
@@ -3915,17 +3973,19 @@ L:      [email protected]
 S:     Maintained
 F:     net/sched/sch_netem.c
 
-NETERION (S2IO) 10GbE DRIVER (xframe/vxge)
-M:     Ramkrishna Vepa <ram.vepa@neterion.com>
-M:     Rastapur Santosh <santosh.rastapur@neterion.com>
-M:     Sivakumar Subramani <sivakumar.subramani@neterion.com>
-M:     Sreenivasa Honnur <sreenivasa.honnur@neterion.com>
+NETERION 10GbE DRIVERS (s2io/vxge)
+M:     Ramkrishna Vepa <ramkrishna.vepa@exar.com>
+M:     Sivakumar Subramani <sivakumar.subramani@exar.com>
+M:     Sreenivasa Honnur <sreenivasa.honnur@exar.com>
+M:     Jon Mason <jon.mason@exar.com>
 L:     [email protected]
 W:     http://trac.neterion.com/cgi-bin/trac.cgi/wiki/Linux?Anonymous
 W:     http://trac.neterion.com/cgi-bin/trac.cgi/wiki/X3100Linux?Anonymous
 S:     Supported
 F:     Documentation/networking/s2io.txt
 F:     drivers/net/s2io*
+F:     Documentation/networking/vxge.txt
+F:     drivers/net/vxge/
 
 NETFILTER/IPTABLES/IPCHAINS
 P:     Rusty Russell
@@ -4024,7 +4084,7 @@ F:        net/rfkill/
 F:     net/wireless/
 F:     include/net/ieee80211*
 F:     include/linux/wireless.h
-F:     include/linux/iw_handler.h
+F:     include/net/iw_handler.h
 F:     drivers/net/wireless/
 
 NETWORKING DRIVERS
@@ -4172,6 +4232,8 @@ M:        David Brownell <[email protected]>
 L:     [email protected]
 L:     [email protected]
 S:     Maintained
+F:     drivers/usb/*/*omap*
+F:     arch/arm/*omap*/usb*
 
 OMFS FILESYSTEM
 M:     Bob Copeland <[email protected]>
@@ -4272,10 +4334,9 @@ F:       include/scsi/osd_*
 F:     fs/exofs/
 
 P54 WIRELESS DRIVER
-M:     Michael Wu <[email protected]>
+M:     Christian Lamparter <[email protected]>
 L:     [email protected]
-W:     http://prism54.org
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mwu/mac80211-drivers.git
+W:     http://wireless.kernel.org/en/users/Drivers/p54
 S:     Maintained
 F:     drivers/net/wireless/p54/
 
@@ -4357,6 +4418,13 @@ M:       Jim Cromie <[email protected]>
 S:     Maintained
 F:     drivers/char/pc8736x_gpio.c
 
+PC87427 HARDWARE MONITORING DRIVER
+M:     Jean Delvare <[email protected]>
+L:     [email protected]
+S:     Maintained
+F:     Documentation/hwmon/pc87427
+F:     drivers/hwmon/pc87427.c
+
 PCA9532 LED DRIVER
 M:     Riku Voipio <[email protected]>
 S:     Maintained
@@ -4513,7 +4581,7 @@ F:        drivers/net/pppox.c
 PPP OVER L2TP
 M:     James Chapman <[email protected]>
 S:     Maintained
-F:     drivers/net/pppol2tp.c
+F:     net/l2tp/l2tp_ppp.c
 F:     include/linux/if_pppol2tp.h
 
 PPS SUPPORT
@@ -4537,14 +4605,9 @@ PRISM54 WIRELESS DRIVER
 M:     "Luis R. Rodriguez" <[email protected]>
 L:     [email protected]
 W:     http://prism54.org
-S:     Maintained
+S:     Obsolete
 F:     drivers/net/wireless/prism54/
 
-PROMISE DC4030 CACHING DISK CONTROLLER DRIVER
-M:     Peter Denison <[email protected]>
-W:     http://www.pnd-pc.demon.co.uk/promise/
-S:     Maintained
-
 PROMISE SATA TX2/TX4 CONTROLLER LIBATA DRIVER
 M:     Mikael Pettersson <[email protected]>
 L:     [email protected]
@@ -4554,14 +4617,14 @@ F:      drivers/ata/sata_promise.*
 PS3 NETWORK SUPPORT
 M:     Geoff Levand <[email protected]>
 L:     [email protected]
-L:     [email protected]
+L:     cbe-oss-dev@lists.ozlabs.org
 S:     Maintained
 F:     drivers/net/ps3_gelic_net.*
 
 PS3 PLATFORM SUPPORT
 M:     Geoff Levand <[email protected]>
-L:     [email protected]
-L:     [email protected]
+L:     linuxppc-dev@lists.ozlabs.org
+L:     cbe-oss-dev@lists.ozlabs.org
 S:     Maintained
 F:     arch/powerpc/boot/ps3*
 F:     arch/powerpc/include/asm/lv1call.h
@@ -4575,8 +4638,9 @@ F:        sound/ppc/snd_ps3*
 
 PS3VRAM DRIVER
 M:     Jim Paris <[email protected]>
-L:     [email protected]
+L:     cbe-oss-dev@lists.ozlabs.org
 S:     Maintained
+F:     drivers/block/ps3vram.c
 
 PTRACE SUPPORT
 M:     Roland McGrath <[email protected]>
@@ -4717,7 +4781,7 @@ T:        git git://git.kernel.org/pub/scm/linux/kernel/git/ivd/rt2x00.git
 F:     drivers/net/wireless/rt2x00/
 
 RAMDISK RAM BLOCK DEVICE DRIVER
-M:     Nick Piggin <npiggin@suse.de>
+M:     Nick Piggin <npiggin@kernel.dk>
 S:     Maintained
 F:     Documentation/blockdev/ramdisk.txt
 F:     drivers/block/brd.c
@@ -4733,9 +4797,8 @@ S:        Maintained
 F:     drivers/rapidio/
 
 RAYLINK/WEBGEAR 802.11 WIRELESS LAN DRIVER
-M:     Corey Thomas <[email protected]>
 L:     [email protected]
-S:     Maintained
+S:     Orphan
 F:     drivers/net/wireless/ray*
 
 RCUTORTURE MODULE
@@ -4804,8 +4867,8 @@ F:        net/rfkill/
 RICOH SMARTMEDIA/XD DRIVER
 M:     Maxim Levitsky <[email protected]>
 S:     Maintained
-F:     drivers/mtd/nand/r822.c
-F:     drivers/mtd/nand/r822.h
+F:     drivers/mtd/nand/r852.c
+F:     drivers/mtd/nand/r852.h
 
 RISCOM8 DRIVER
 S:     Orphan
@@ -5021,7 +5084,7 @@ F:        drivers/mmc/host/sdhci.*
 
 SECURE DIGITAL HOST CONTROLLER INTERFACE, OPEN FIRMWARE BINDINGS (SDHCI-OF)
 M:     Anton Vorontsov <[email protected]>
-L:     [email protected]
+L:     linuxppc-dev@lists.ozlabs.org
 L:     [email protected]
 S:     Maintained
 F:     drivers/mmc/host/sdhci-of.*
@@ -5061,6 +5124,14 @@ S:       Supported
 F:     include/linux/selinux*
 F:     security/selinux/
 
+APPARMOR SECURITY MODULE
+M:     John Johansen <[email protected]>
+L:     [email protected] (subscribers-only, general discussion)
+W:     apparmor.wiki.kernel.org
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jj/apparmor-dev.git
+S:     Supported
+F:     security/apparmor/
+
 SENSABLE PHANTOM
 M:     Jiri Slaby <[email protected]>
 S:     Maintained
@@ -5224,6 +5295,20 @@ M:       Nicolas Pitre <[email protected]>
 S:     Odd Fixes
 F:     drivers/net/smc91x.*
 
+SMM665 HARDWARE MONITOR DRIVER
+M:     Guenter Roeck <[email protected]>
+L:     [email protected]
+S:     Maintained
+F:     Documentation/hwmon/smm665
+F:     drivers/hwmon/smm665.c
+
+SMSC EMC2103 HARDWARE MONITOR DRIVER
+M:     Steve Glendinning <[email protected]>
+L:     [email protected]
+S:     Supported
+F:     Documentation/hwmon/emc2103
+F:     drivers/hwmon/emc2103.c
+
 SMSC47B397 HARDWARE MONITOR DRIVER
 M:     "Mark M. Hoffman" <[email protected]>
 L:     [email protected]
@@ -5244,11 +5329,6 @@ L:       [email protected]
 S:     Supported
 F:     drivers/net/smsc9420.*
 
-SMX UIO Interface
-M:     Ben Nizette <[email protected]>
-S:     Maintained
-F:     drivers/uio/uio_smx.c
-
 SN-IA64 (Itanium) SUB-PLATFORM
 M:     Jes Sorensen <[email protected]>
 L:     [email protected]
@@ -5336,7 +5416,7 @@ T:        git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git
 S:     Maintained
 F:     arch/sparc/
-F:     drivers/sbus
+F:     drivers/sbus/
 
 SPARC SERIAL DRIVERS
 M:     "David S. Miller" <[email protected]>
@@ -5378,7 +5458,8 @@ S:        Maintained
 F:     arch/arm/mach-spear*/clock.c
 F:     arch/arm/mach-spear*/include/mach/clkdev.h
 F:     arch/arm/plat-spear/clock.c
-F:     arch/arm/plat-spear/include/plat/clock.h and clkdev.h
+F:     arch/arm/plat-spear/include/plat/clkdev.h
+F:     arch/arm/plat-spear/include/plat/clock.h
 
 SPEAR PAD MULTIPLEXING SUPPORT
 M:     Viresh Kumar <[email protected]>
@@ -5420,8 +5501,8 @@ F:        drivers/net/spider_net*
 
 SPU FILE SYSTEM
 M:     Jeremy Kerr <[email protected]>
-L:     [email protected]
-L:     [email protected]
+L:     linuxppc-dev@lists.ozlabs.org
+L:     cbe-oss-dev@lists.ozlabs.org
 W:     http://www.ibm.com/developerworks/power/cell/
 S:     Supported
 F:     Documentation/filesystems/spufs.txt
@@ -5458,11 +5539,6 @@ M:       Ion Badulescu <[email protected]>
 S:     Odd Fixes
 F:     drivers/net/starfire*
 
-STARMODE RADIO IP (STRIP) PROTOCOL DRIVER
-S:     Orphan
-F:     drivers/staging/strip/strip.c
-F:     include/linux/if_strip.h
-
 STRADIS MPEG-2 DECODER DRIVER
 M:     Nathan Laredo <[email protected]>
 W:     http://www.stradis.com/
@@ -5538,6 +5614,15 @@ W:       http://tcp-lp-mod.sourceforge.net/
 S:     Maintained
 F:     net/ipv4/tcp_lp.c
 
+TEGRA SUPPORT
+M:     Colin Cross <[email protected]>
+M:     Erik Gilling <[email protected]>
+M:     Olof Johansson <[email protected]>
+L:     [email protected]
+T:     git git://android.git.kernel.org/kernel/tegra.git
+S:     Supported
+F:     arch/arm/mach-tegra
+
 TEHUTI ETHERNET DRIVER
 M:     Alexander Indenbaum <[email protected]>
 M:     Andy Gospodarek <[email protected]>
@@ -5590,6 +5675,12 @@ F:       include/linux/tipc*.h
 F:     include/net/tipc/
 F:     net/tipc/
 
+TILE ARCHITECTURE
+M:     Chris Metcalf <[email protected]>
+W:     http://www.tilera.com/scm/
+S:     Supported
+F:     arch/tile/
+
 TLAN NETWORK DRIVER
 M:     Samuel Chessman <[email protected]>
 L:     [email protected] (subscribers-only)
@@ -5605,7 +5696,7 @@ L:        [email protected] (subscribers-only, for developers and us
 L:     [email protected] (subscribers-only, for developers in Japanese)
 L:     [email protected] (subscribers-only, for users in Japanese)
 W:     http://tomoyo.sourceforge.jp/
-T:     quilt http://svn.sourceforge.jp/svnroot/tomoyo/trunk/2.2.x/tomoyo-lsm/patches/
+T:     quilt http://svn.sourceforge.jp/svnroot/tomoyo/trunk/2.3.x/tomoyo-lsm/patches/
 S:     Maintained
 F:     security/tomoyo/
 
@@ -5654,7 +5745,7 @@ 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
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git perf/core
 S:     Maintained
 F:     Documentation/trace/ftrace.txt
 F:     arch/*/*/*/ftrace.h
@@ -5727,6 +5818,9 @@ UCLINUX FOR RENESAS H8/300 (H8300)
 M:     Yoshinori Sato <[email protected]>
 W:     http://uclinux-h8.sourceforge.jp/
 S:     Supported
+F:     arch/h8300/
+F:     drivers/ide/ide-h8300.c
+F:     drivers/net/ne-h8300.c
 
 UDF FILESYSTEM
 M:     Jan Kara <[email protected]>
@@ -6018,7 +6112,7 @@ F:        drivers/net/usb/usbnet.c
 F:     include/linux/usb/usbnet.h
 
 USB VIDEO CLASS
-M:     Laurent Pinchart <laurent.pinchart@skynet.be>
+M:     Laurent Pinchart <laurent.pinchart@ideasonboard.com>
 L:     [email protected] (subscribers-only)
 L:     [email protected]
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
@@ -6060,10 +6154,9 @@ F:       Documentation/video4linux/zc0301.txt
 F:     drivers/media/video/zc0301/
 
 USB ZD1201 DRIVER
-M:     Jeroen Vreeken <[email protected]>
-L:     [email protected]
+L:     [email protected]
 W:     http://linux-lc100020.sourceforge.net
-S:     Maintained
+S:     Orphan
 F:     drivers/net/wireless/zd1201.*
 
 USB ZR364XX DRIVER
@@ -6152,9 +6245,12 @@ F:       drivers/mmc/host/via-sdmmc.c
 
 VIA UNICHROME(PRO)/CHROME9 FRAMEBUFFER DRIVER
 M:     Joseph Chan <[email protected]>
-M:     Scott Fang <[email protected]>
+M:     Florian Tobias Schandinat <[email protected]>
 L:     [email protected]
 S:     Maintained
+F:     include/linux/via-core.h
+F:     include/linux/via-gpio.h
+F:     include/linux/via_i2c.h
 F:     drivers/video/via/
 
 VIA VELOCITY NETWORK DRIVER
@@ -6251,14 +6347,6 @@ F:       Documentation/watchdog/
 F:     drivers/watchdog/
 F:     include/linux/watchdog.h
 
-WAVELAN NETWORK DRIVER & WIRELESS EXTENSIONS
-M:     Jean Tourrilhes <[email protected]>
-L:     [email protected]
-W:     http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/
-S:     Maintained
-F:     Documentation/networking/wavelan.txt
-F:     drivers/staging/wavelan/
-
 WD7000 SCSI DRIVER
 M:     Miroslav Zagorac <[email protected]>
 L:     [email protected]
@@ -6276,6 +6364,11 @@ M:       [email protected]
 L:     [email protected]
 S:     Supported
 W:     http://linuxwimax.org
+F:     Documentation/wimax/README.wimax
+F:     include/linux/wimax.h
+F:     include/linux/wimax/debug.h
+F:     include/net/wimax.h
+F:     net/wimax/
 
 WIMEDIA LLC PROTOCOL (WLP) SUBSYSTEM
 M:     David Vrabel <[email protected]>
@@ -6325,8 +6418,9 @@ S:        Supported
 F:     drivers/input/touchscreen/*wm97*
 F:     include/linux/wm97xx.h
 
-WOLFSON MICROELECTRONICS PMIC DRIVERS
+WOLFSON MICROELECTRONICS DRIVERS
 M:     Mark Brown <[email protected]>
+M:     Ian Lartey <[email protected]>
 T:     git git://opensource.wolfsonmicro.com/linux-2.6-audioplus
 W:     http://opensource.wolfsonmicro.com/node/8
 S:     Supported
@@ -6341,8 +6435,8 @@ 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.*
-F:     sound/soc/codecs/wm8400.*
+F:     include/sound/wm????.h
+F:     sound/soc/codecs/wm*
 
 X.25 NETWORK LAYER
 M:     Andrew Hendry <[email protected]>