Merge branch 'for-2.6.31' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

Conflicts:
	MAINTAINERS

diff --combined MAINTAINERS
index fa2a16def17afb765ad447f10b5dde634f83ded9,a20ac54f02501fd7d89d33617cf91b1f82447dff..3ba68dc9fe48d4c472271581b82c30494ce01290
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -36,12 -36,6 +36,12 @@@ trivial patch so apply some common sens
        (scripts/checkpatch.pl) to catch trival style violations.
        See Documentation/CodingStyle for guidance here.
  
 +      PLEASE CC: the maintainers and mailing lists that are generated
 +      by scripts/get_maintainer.pl.  The results returned by the
 +      script will be best if you have git installed and are making
 +      your changes in a branch derived from Linus' latest git tree.
 +      See Documentation/SubmittingPatches for details.
 +
        PLEASE try to include any credit lines you want added with the
        patch. It avoids people being missed off by mistake and makes
        it easier to know who wants adding and who doesn't.
@@@ -77,7 -71,7 +77,7 @@@ P: Perso
  M: Mail patches to
  L: Mailing list that is relevant to this area
  W: Web-page with status/info
 -T: SCM tree type and location.  Type is one of: git, hg, quilt.
 +T: SCM tree type and location.  Type is one of: git, hg, quilt, stgit.
  S: Status, one of the following:
  
        Supported:      Someone is actually paid to look after this.
@@@ -163,11 -157,9 +163,11 @@@ S:       Maintaine
  F:    drivers/net/r8169.c
  
  8250/16?50 (AND CLONE UARTS) SERIAL DRIVER
 +P:    Alan Cox
 +M:    [email protected]
  L:    [email protected]
  W:    http://serial.sourceforge.net
 -S:    Orphan
 +S:    Odd Fixes
  F:    drivers/serial/8250*
  F:    include/linux/serial_8250.h
  
@@@ -230,13 -222,6 +230,13 @@@ L:       [email protected]
  S:    Maintained
  F:    drivers/net/acenic*
  
 +ACER ASPIRE ONE TEMPERATURE AND FAN DRIVER
 +P: Peter Feuerer
 +M: [email protected]
 +W: http://piie.net/?section=acerhdf
 +S: Maintained
 +F: drivers/platform/x86/acerhdf.c
 +
  ACER WMI LAPTOP EXTRAS
  P:    Carlos Corbacho
  M:    [email protected]
@@@ -449,7 -434,7 +449,7 @@@ F: arch/alpha
  
  AMD GEODE CS5536 USB DEVICE CONTROLLER DRIVER
  P:    Thomas Dahlmann
 -M:    [email protected]
 +M:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  F:    drivers/usb/gadget/amd5536udc.*
@@@ -502,7 -487,7 +502,7 @@@ AOA (Apple Onboard Audio) ALSA DRIVE
  P:    Johannes Berg
  M:    [email protected]
  L:    [email protected]
 -L:    [email protected] (subscribers-only)
 +L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    sound/aoa/
  
@@@ -639,7 -624,6 +639,7 @@@ M: [email protected]
  L:    [email protected] (subscribers-only)
  T:    git git://gitorious.org/linux-gemini/mainline.git
  S:    Maintained
 +F:    arch/arm/mach-gemini/
  
  ARM/EBSA110 MACHINE SUPPORT
  P:    Russell King
@@@ -660,15 -644,12 +660,15 @@@ M:      [email protected]
  L:    [email protected] (subscribers-only)
  W:    http://www.openezx.org/
  S:    Maintained
 +T:    topgit git://git.openezx.org/openezx.git
 +F:    arch/arm/mach-pxa/ezx.c
  
  ARM/FARADAY FA526 PORT
  P:    Paulius Zaleckas
  M:    [email protected]
  L:    [email protected] (subscribers-only)
  S:    Maintained
 +F:    arch/arm/mm/*-fa*
  
  ARM/FOOTBRIDGE ARCHITECTURE
  P:    Russell King
@@@ -697,13 -678,6 +697,13 @@@ M:       [email protected]
  L:    [email protected] (subscribers-only)
  S:    Maintained
  
 +ARM/H4700 (HP IPAQ HX4700) MACHINE SUPPORT
 +P:    Philipp Zabel
 +M:    [email protected]
 +S:    Maintained
 +F:    arch/arm/mach-pxa/hx4700.c
 +F:    arch/arm/mach-pxa/include/mach/hx4700.h
 +
  ARM/HP JORNADA 7XX MACHINE SUPPORT
  P:    Kristoffer Ericson
  M:    [email protected]
@@@ -783,25 -757,11 +783,25 @@@ P:      Philipp Zabe
  M:    [email protected]
  S:    Maintained
  
 +ARM/MIOA701 MACHINE SUPPORT
 +P:    Robert Jarzmik
 +M:    [email protected]
 +L:    [email protected] (subscribers-only)
 +F:    arch/arm/mach-pxa/mioa701.c
 +S:    Maintained
 +
  ARM/NEC MOBILEPRO 900/c MACHINE SUPPORT
  P:    Michael Petchkovsky
  M:    [email protected]
  S:    Maintained
  
 +ARM/OPENMOKO NEO FREERUNNER (GTA02) MACHINE SUPPORT
 +P:    Nelson Castillo
 +M:    [email protected]
 +L:    [email protected] (subscribers-only)
 +W:    http://wiki.openmoko.org/wiki/Neo_FreeRunner
 +S:    Supported
 +
  ARM/TOSA MACHINE SUPPORT
  P:    Dmitry Eremin-Solenikov
  M:    [email protected]
@@@ -815,12 -775,6 +815,12 @@@ M:       [email protected]
  W:    http://hackndev.com
  S:    Maintained
  
 +ARM/PALM TREO 680 SUPPORT
 +P:    Tomas Cech
 +M:    [email protected]
 +W:    http://hackndev.com
 +S:    Maintained
 +
  ARM/PALMZ72 SUPPORT
  P:    Sergey Lapin
  M:    [email protected]
@@@ -920,7 -874,8 +920,7 @@@ M: [email protected]
  P:    Karol Kozimor
  M:    [email protected]
  L:    [email protected]
 -W:    http://sourceforge.net/projects/acpi4asus
 -W:    http://xf.iksaif.net/acpi4asus
 +W:    http://acpi4asus.sf.net
  S:    Maintained
  F:    arch/x86/kernel/acpi/boot.c
  F:    drivers/platform/x86/asus_acpi.c
@@@ -936,7 -891,8 +936,7 @@@ ASUS LAPTOP EXTRAS DRIVE
  P:    Corentin Chary
  M:    [email protected]
  L:    [email protected]
 -W:    http://sourceforge.net/projects/acpi4asus
 -W:    http://xf.iksaif.net/acpi4asus
 +W:    http://acpi4asus.sf.net
  S:    Maintained
  F:    drivers/platform/x86/asus-laptop.c
  
@@@ -945,6 -901,7 +945,6 @@@ P: Dan William
  M:    [email protected]
  P:    Maciej Sosnowski
  M:    [email protected]
 -L:    [email protected]
  W:    http://sourceforge.net/projects/xscaleiop
  S:    Supported
  F:    Documentation/crypto/async-tx-api.txt
@@@ -973,23 -930,17 +973,23 @@@ M:      [email protected]
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
 -F:    drivers/net/wireless/ath5k/
 +F:    drivers/net/wireless/ath/ath5k/
  
  ATHEROS ATH9K WIRELESS DRIVER
  P:    Luis R. Rodriguez
  M:    [email protected]
  P:    Jouni Malinen
  M:    [email protected]
 +P:    Sujith Manoharan
 +M:    [email protected]
 +P:    Vasanthakumar Thiagarajan
 +M:    [email protected]
 +P:    Senthil Balasubramanian
 +M:    [email protected]
  L:    [email protected]
  L:    [email protected]
  S:    Supported
 -F:    drivers/net/wireless/ath9k/
 +F:    drivers/net/wireless/ath/ath9k/
  
  ATHEROS AR9170 WIRELESS DRIVER
  P:    Christian Lamparter
@@@ -997,7 -948,7 +997,7 @@@ M: [email protected]
  L:    [email protected]
  W:    http://wireless.kernel.org/en/users/Drivers/ar9170
  S:    Maintained
 -F:    drivers/net/wireless/ar9170/
 +F:    drivers/net/wireless/ath/ar9170/
  
  ATI_REMOTE2 DRIVER
  P:    Ville Syrjala
@@@ -1037,16 -988,10 +1037,16 @@@ W:    http://www.at91.com
  S:    Maintained
  F:    drivers/mmc/host/at91_mci.c
  
 +ATMEL AT91 / AT32 MCI DRIVER
 +P:    Nicolas Ferre
 +M:    [email protected]
 +S:    Maintained
 +F:    drivers/mmc/host/atmel-mci.c
 +F:    drivers/mmc/host/atmel-mci-regs.h
 +
  ATMEL AT91 / AT32 SERIAL DRIVER
  P:    Haavard Skinnemoen
  M:    [email protected]
 -L:    [email protected]
  S:    Supported
  F:    drivers/serial/atmel_serial.c
  
@@@ -1102,6 -1047,7 +1102,6 @@@ F:      kernel/audit
  AUXILIARY DISPLAY DRIVERS
  P:    Miguel Ojeda Sandonis
  M:    [email protected]
 -L:    [email protected]
  W:    http://miguelojeda.es/auxdisplay.htm
  W:    http://jair.lab.fi.uva.es/~migojed/auxdisplay.htm
  S:    Maintained
@@@ -1171,6 -1117,7 +1171,6 @@@ F:      drivers/net/hamradio/baycom
  BEFS FILE SYSTEM
  P:    Sergey S. Kostyliov
  M:    [email protected]
 -L:    [email protected]
  S:    Maintained
  F:    Documentation/filesystems/befs.txt
  F:    fs/befs/
@@@ -1178,23 -1125,24 +1178,23 @@@
  BFS FILE SYSTEM
  P:    Tigran A. Aivazian
  M:    [email protected]
 -L:    [email protected]
  S:    Maintained
  F:    Documentation/filesystems/bfs.txt
  F:    fs/bfs/
  F:    include/linux/bfs_fs.h
  
  BLACKFIN ARCHITECTURE
 -P:    Bryan Wu
 -M:    cooloney@kernel.org
 +P:    Mike Frysinger
 +M:    vapier@gentoo.org
  L:    [email protected]
  W:    http://blackfin.uclinux.org
  S:    Supported
  F:    arch/blackfin/
  
  BLACKFIN EMAC DRIVER
 -P:    Bryan Wu
 -M:    [email protected]
 -L:    [email protected] (subscribers-only)
 +P:    Michael Hennerich
 +M:    [email protected]
 +L:    [email protected]
  W:    http://blackfin.uclinux.org
  S:    Supported
  F:    drivers/net/bfin_mac.*
@@@ -1202,7 -1150,7 +1202,7 @@@
  BLACKFIN RTC DRIVER
  P:    Mike Frysinger
  M:    [email protected]
 -L:    [email protected] (subscribers-only)
 +L:    [email protected]
  W:    http://blackfin.uclinux.org
  S:    Supported
  F:    drivers/rtc/rtc-bfin.c
@@@ -1210,7 -1158,7 +1210,7 @@@
  BLACKFIN SERIAL DRIVER
  P:    Sonic Zhang
  M:    [email protected]
 -L:    [email protected] (subscribers-only)
 +L:    [email protected]
  W:    http://blackfin.uclinux.org
  S:    Supported
  F:    drivers/serial/bfin_5xx.c
@@@ -1218,7 -1166,7 +1218,7 @@@
  BLACKFIN WATCHDOG DRIVER
  P:    Mike Frysinger
  M:    [email protected]
 -L:    [email protected] (subscribers-only)
 +L:    [email protected]
  W:    http://blackfin.uclinux.org
  S:    Supported
  F:    drivers/watchdog/bfin_wdt.c
@@@ -1226,7 -1174,7 +1226,7 @@@
  BLACKFIN I2C TWI DRIVER
  P:    Sonic Zhang
  M:    [email protected]
 -L:    [email protected] (subscribers-only)
 +L:    [email protected]
  W:    http://blackfin.uclinux.org/
  S:    Supported
  F:    drivers/i2c/busses/i2c-bfin-twi.c
@@@ -1234,6 -1182,7 +1234,6 @@@
  BLOCK LAYER
  P:    Jens Axboe
  M:    [email protected]
 -L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-2.6-block.git
  S:    Maintained
  F:    block/
@@@ -1360,6 -1309,7 +1360,6 @@@ P:      Muli Ben-Yehud
  M:    [email protected]
  P:    Jon D. Mason
  M:    [email protected]
 -L:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    arch/x86/kernel/pci-calgary_64.c
@@@ -1379,13 -1329,6 +1379,13 @@@ F:    drivers/net/can
  F:    include/linux/can/
  F:    include/linux/can.h
  
 +CAN NETWORK DRIVERS
 +P:    Wolfgang Grandegger
 +M:    [email protected]
 +L:    [email protected] (subscribers-only)
 +W:    http://developer.berlios.de/projects/socketcan/
 +S:    Maintained
 +
  CELL BROADBAND ENGINE ARCHITECTURE
  P:    Arnd Bergmann
  M:    [email protected]
@@@ -1411,6 -1354,7 +1411,6 @@@ F:      include/linux/usb/wusb
  CFAG12864B LCD DRIVER
  P:    Miguel Ojeda Sandonis
  M:    [email protected]
 -L:    [email protected]
  W:    http://miguelojeda.es/auxdisplay.htm
  W:    http://jair.lab.fi.uva.es/~migojed/auxdisplay.htm
  S:    Maintained
@@@ -1420,6 -1364,7 +1420,6 @@@ F:      include/linux/cfag12864b.
  CFAG12864BFB LCD FRAMEBUFFER DRIVER
  P:    Miguel Ojeda Sandonis
  M:    [email protected]
 -L:    [email protected]
  W:    http://miguelojeda.es/auxdisplay.htm
  W:    http://jair.lab.fi.uva.es/~migojed/auxdisplay.htm
  S:    Maintained
@@@ -1439,6 -1384,7 +1439,6 @@@ X:      net/wireless/wext
  CHECKPATCH
  P:    Andy Whitcroft
  M:    [email protected]
 -L:    [email protected]
  S:    Supported
  F:    scripts/checkpatch.pl
  
@@@ -1467,7 -1413,7 +1467,7 @@@ F:      drivers/usb/host/ohci-ep93xx.
  CIRRUS LOGIC CS4270 SOUND DRIVER
  P:    Timur Tabi
  M:    [email protected]
 -L:    [email protected]
 +L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  F:    sound/soc/codecs/cs4270*
  
@@@ -1485,15 -1431,6 +1485,15 @@@ P:    Russell Kin
  M:    [email protected]
  F:    include/linux/clk.h
  
 +CISCO FCOE HBA DRIVER
 +P:    Abhijeet Joglekar
 +M:    [email protected]
 +P:    Joe Eykholt
 +M:    [email protected]
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/scsi/fnic/
 +
  CODA FILE SYSTEM
  P:    Jan Harkes
  M:    [email protected]
@@@ -1565,6 -1502,7 +1565,6 @@@ F:      drivers/usb/atm/cxacru.
  CONFIGFS
  P:    Joel Becker
  M:    [email protected]
 -L:    [email protected]
  S:    Supported
  F:    fs/configfs/
  F:    include/linux/configfs.h
@@@ -1578,7 -1516,6 +1578,7 @@@ L:      [email protected]
  S:    Maintained
  F:    include/linux/cgroup*
  F:    kernel/cgroup*
 +F:    mm/*cgroup*
  
  CORETEMP HARDWARE MONITORING DRIVER
  P:    Rudolf Marek
@@@ -1595,13 -1532,6 +1595,13 @@@ W:    http://www.fi.muni.cz/~kas/cosa
  S:    Maintained
  F:    drivers/net/wan/cosa*
  
 +CPMAC ETHERNET DRIVER
 +P:    Florian Fainelli
 +M:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/net/cpmac.c
 +
  CPU FREQUENCY DRIVERS
  P:    Dave Jones
  M:    [email protected]
@@@ -1623,6 -1553,7 +1623,6 @@@ F:      arch/x86/kernel/msr.
  CPUSETS
  P:    Paul Menage
  M:    [email protected]
 -L:    [email protected]
  W:    http://www.bullopensource.org/cpuset/
  W:    http://oss.sgi.com/projects/cpusets/
  S:    Supported
@@@ -1641,7 -1572,7 +1641,7 @@@ P:      Mikael Starvi
  M:    [email protected]
  P:    Jesper Nilsson
  M:    [email protected]
 -L:    dev-etrax@axis.com
 +L:    linux-cris-kernel@axis.com
  W:    http://developer.axis.com
  S:    Maintained
  F:    arch/cris/
@@@ -1829,6 -1760,7 +1829,6 @@@ DEVICE NUMBER REGISTR
  P:    Torben Mathiasen
  M:    [email protected]
  W:    http://lanana.org/docs/device-list/index.html
 -L:    [email protected]
  S:    Maintained
  
  DEVICE-MAPPER  (LVM)
@@@ -1852,9 -1784,10 +1852,9 @@@ F:     drivers/char/epca
  F:    drivers/char/digi*
  
  DIRECTORY NOTIFICATION (DNOTIFY)
 -P:    Stephen Rothwell
 -M:    [email protected]
 -L:    [email protected]
 -S:    Supported
 +P:    Eric Paris
 +M:    [email protected]
 +S:    Maintained
  F:    Documentation/filesystems/dnotify.txt
  F:    fs/notify/dnotify/
  F:    include/linux/dnotify.h
@@@ -1870,6 -1803,7 +1870,6 @@@ S:      Maintaine
  DISKQUOTA
  P:    Jan Kara
  M:    [email protected]
 -L:    [email protected]
  S:    Maintained
  F:    Documentation/filesystems/quota.txt
  F:    fs/quota/
@@@ -1891,6 -1825,7 +1891,6 @@@ P:      Maciej Sosnowsk
  M:    [email protected]
  P:    Dan Williams
  M:    [email protected]
 -L:    [email protected]
  S:    Supported
  F:    drivers/dma/
  F:    include/linux/dma*
@@@ -1942,6 -1877,7 +1942,6 @@@ F:      drivers/scsi/dpt
  DRIVER CORE, KOBJECTS, AND SYSFS
  P:    Greg Kroah-Hartman
  M:    [email protected]
 -L:    [email protected]
  T:    quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/
  S:    Supported
  F:    Documentation/kobject.txt
@@@ -2007,8 -1943,8 +2007,8 @@@ F:      net/bridge/netfilter/ebt*.
  ECRYPT FILE SYSTEM
  P:    Tyler Hicks
  M:    [email protected]
 -M:    Dustin Kirkland
 -P:    [email protected]
 +P:    Dustin Kirkland
 +M:    [email protected]
  L:    [email protected]
  W:    https://launchpad.net/ecryptfs
  S:    Supported
@@@ -2025,20 -1961,10 +2025,20 @@@ F:   Documentation/edac.tx
  F:    drivers/edac/edac_*
  F:    include/linux/edac.h
  
 +EDAC-AMD64
 +P:    Doug Thompson
 +M:    [email protected]
 +P:    Borislav Petkov
 +M:    [email protected]
 +L:    [email protected] (moderated for non-subscribers)
 +W:    bluesmoke.sourceforge.net
 +S:    Supported
 +F:    drivers/edac/amd64_edac*
 +
  EDAC-E752X
  P:    Mark Gross
 -P:    Doug Thompson
  M:    [email protected]
 +P:    Doug Thompson
  M:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  W:    bluesmoke.sourceforge.net
@@@ -2087,8 -2013,8 +2087,8 @@@ F:      drivers/edac/i5400_edac.
  
  EDAC-I82975X
  P:    Ranganathan Desikan
 -P:    Arvind R.
  M:    [email protected]
 +P:    Arvind R.
  M:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  W:    bluesmoke.sourceforge.net
@@@ -2115,7 -2041,7 +2115,7 @@@ EEEPC LAPTOP EXTRAS DRIVE
  P:    Corentin Chary
  M:    [email protected]
  L:    [email protected]
 -W:    http://sourceforge.net/projects/acpi4asus
 +W:    http://acpi4asus.sf.net
  S:    Maintained
  F:    drivers/platform/x86/eeepc-laptop.c
  
@@@ -2151,15 -2077,6 +2151,15 @@@ W:    http://sourceforge.net/projects/lpfc
  S:    Supported
  F:    drivers/scsi/lpfc/
  
 +ENE CB710 FLASH CARD READER DRIVER
 +P:    Michał Mirosław
 +M:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/misc/cb710/
 +F:    drivers/mmc/host/cb710-mmc.*
 +F:    include/linux/cb710.h
 +
  EPSON 1355 FRAMEBUFFER DRIVER
  P:    Christopher Hoover
  M:    [email protected]
@@@ -2288,6 -2205,7 +2288,6 @@@ F:      drivers/firewire
  F:    include/linux/firewire*.h
  
  FIRMWARE LOADER (request_firmware)
 -L:    [email protected]
  S:    Orphan
  F:    Documentation/firmware_class/
  F:    drivers/base/firmware*.c
@@@ -2309,9 -2227,11 +2309,9 @@@ F:     drivers/net/wan/dlci.
  F:    drivers/net/wan/sdla.c
  
  FRAMEBUFFER LAYER
 -P:    Antonino Daplas
 -M:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  W:    http://linux-fbdev.sourceforge.net/
 -S:    Maintained
 +S:    Orphan
  F:    Documentation/fb/
  F:    drivers/video/fb*
  F:    include/linux/fb.h
@@@ -2321,7 -2241,8 +2321,7 @@@ P:      Li Yan
  M:    [email protected]
  P:    Zhang Wei
  M:    [email protected]
 -L:    [email protected]
 -L:    [email protected]
 +L:    [email protected]
  S:    Maintained
  F:    drivers/dma/fsldma.*
  
@@@ -2387,7 -2308,7 +2387,7 @@@ F:      drivers/serial/ucc_uart.
  FREESCALE SOC SOUND DRIVERS
  P:    Timur Tabi
  M:    [email protected]
 -L:    [email protected]
 +L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
  S:    Supported
  F:    sound/soc/fsl/fsl*
@@@ -2402,7 -2323,7 +2402,7 @@@ F:      fs/freevxfs
  
  FREEZER
  P:    Pavel Machek
 -M:    pavel@suse.cz
 +M:    pavel@ucw.cz
  P:    Rafael J. Wysocki
  M:    [email protected]
  L:    [email protected]
@@@ -2424,7 -2345,7 +2424,7 @@@ FTRAC
  P:    Steven Rostedt
  M:    [email protected]
  S:    Maintained
 -F:    Documentation/ftrace.txt
 +F:    Documentation/trace/ftrace.txt
  F:    arch/*/*/*/ftrace.h
  F:    arch/*/kernel/ftrace.c
  F:    include/*/ftrace.h
@@@ -2487,14 -2408,6 +2487,14 @@@ F:    drivers/net/wan/pc300too.
  F:    drivers/net/wan/pci200syn.c
  F:    drivers/net/wan/wanxl*
  
 +GENERIC INCLUDE/ASM HEADER FILES
 +P:    Arnd Bergmann
 +M:    [email protected]
 +L:    [email protected]
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git
 +S:    Maintained
 +F:    include/asm-generic
 +
  GFS2 FILE SYSTEM
  P:    Steven Whitehouse
  M:    [email protected]
@@@ -2529,6 -2442,7 +2529,6 @@@ F:      drivers/hwmon/hdaps.
  
  HYPERVISOR VIRTUAL CONSOLE DRIVER
  L:    [email protected]
 -L:    [email protected]
  S:    Odd Fixes
  F:    drivers/char/hvc_*
  
@@@ -2595,6 -2509,7 +2595,6 @@@ F:      sound/parisc/harmony.
  HAYES ESP SERIAL DRIVER
  P:    Andrew J. Robinson
  M:    [email protected]
 -L:    [email protected]
  W:    http://www.nyx.net/~arobinso
  S:    Maintained
  F:    Documentation/serial/hayes-esp.txt
@@@ -2620,6 -2535,7 +2620,6 @@@ F:      include/linux/cciss_ioctl.
  HFS FILESYSTEM
  P:    Roman Zippel
  M:    [email protected]
 -L:    [email protected]
  S:    Maintained
  F:    Documentation/filesystems/hfs.txt
  F:    fs/hfs/
@@@ -2659,6 -2575,7 +2659,6 @@@ F:      include/linux/hid
  HIGH-RESOLUTION TIMERS, CLOCKEVENTS, DYNTICKS
  P:    Thomas Gleixner
  M:    [email protected]
 -L:    [email protected]
  S:    Maintained
  F:    Documentation/timers/
  F:    kernel/hrtimer.c
@@@ -2797,6 -2714,7 +2797,6 @@@ F:      drivers/i2c/busses/i2c-tiny-usb.
  i386 BOOT CODE
  P:    H. Peter Anvin
  M:    [email protected]
 -L:    [email protected]
  S:    Maintained
  F:    arch/x86/boot/
  
@@@ -2837,10 -2755,10 +2837,10 @@@ S:   Supporte
  F:    drivers/scsi/ips.*
  
  IDE SUBSYSTEM
 -P:    Bartlomiej Zolnierkiewicz
 -M:    [email protected]
 +P:    David S. Miller
 +M:    [email protected]
  L:    [email protected]
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6.git
  S:    Maintained
  F:    Documentation/ide/
  F:    drivers/ide/
@@@ -2881,18 -2799,6 +2881,18 @@@ L:    [email protected]
  S:    Maintained
  F:    drivers/ieee1394/raw1394*
  
 +IEEE 802.15.4 SUBSYSTEM
 +P:    Dmitry Eremin-Solenikov
 +M:    [email protected]
 +P:    Sergey Lapin
 +M:    [email protected]
 +L:    [email protected]
 +W:    http://apps.sourceforge.net/trac/linux-zigbee
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lowpan/lowpan.git
 +S:    Maintained
 +F:    net/ieee802154/
 +F:    drivers/ieee802154/
 +
  INTEGRITY MEASUREMENT ARCHITECTURE (IMA)
  P:    Mimi Zohar
  M:    [email protected]
@@@ -2924,8 -2830,7 +2924,8 @@@ P:      John McCutcha
  M:    [email protected]
  P:    Robert Love
  M:    [email protected]
 -L:    [email protected]
 +P:    Eric Paris
 +M:    [email protected]
  S:    Maintained
  F:    Documentation/filesystems/inotify.txt
  F:    fs/notify/inotify/
@@@ -2973,6 -2878,7 +2973,6 @@@ F:      arch/x86/kernel/microcode_intel.
  INTEL I/OAT DMA DRIVER
  P:    Maciej Sosnowski
  M:    [email protected]
 -L:    [email protected]
  S:    Supported
  F:    drivers/dma/ioat*
  
@@@ -2988,6 -2894,7 +2988,6 @@@ F:      include/linux/intel-iommu.
  INTEL IOP-ADMA DMA DRIVER
  P:    Dan Williams
  M:    [email protected]
 -L:    [email protected]
  S:    Supported
  F:    drivers/dma/iop-adma.c
  
@@@ -3183,7 -3090,6 +3183,7 @@@ M:      [email protected]
  L:    [email protected] (subscribers-only)
  W:    http://irda.sourceforge.net/
  S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/irda-2.6.git
  F:    Documentation/networking/irda.txt
  F:    drivers/net/irda/
  F:    include/net/irda/
@@@ -3265,6 -3171,7 +3265,6 @@@ W:      http://www.linux-mtd.infradead.org/d
  S:    Maintained
  F:    fs/jffs2/
  F:    include/linux/jffs2.h
 -F:    include/mtd/jffs2-user.h
  
  JOURNALLING LAYER FOR BLOCK DEVICES (JBD)
  P:    Stephen Tweedie
@@@ -3299,6 -3206,7 +3299,6 @@@ M:      [email protected]
  P:    Haren Myneni
  M:    [email protected]
  L:    [email protected]
 -L:    [email protected]
  W:    http://lse.sourceforge.net/kdump/
  S:    Maintained
  F:    Documentation/kdump/
@@@ -3408,6 -3316,7 +3408,6 @@@ KEXE
  P:    Eric Biederman
  M:    [email protected]
  W:    http://ftp.kernel.org/pub/linux/kernel/people/horms/kexec-tools/
 -L:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    include/linux/kexec.h
@@@ -3424,30 -3333,13 +3424,30 @@@ F:   drivers/serial/kgdboc.
  F:    include/linux/kgdb.h
  F:    kernel/kgdb.c
  
 +KMEMCHECK
 +P:    Vegard Nossum
 +M:    [email protected]
 +P     Pekka Enberg
 +M:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +
 +KMEMLEAK
 +P:    Catalin Marinas
 +M:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/kmemleak.txt
 +F:    include/linux/kmemleak.h
 +F:    mm/kmemleak.c
 +F:    mm/kmemleak-test.c
 +
  KMEMTRACE
  P:    Eduard - Gabriel Munteanu
  M:    [email protected]
 -L:    [email protected]
  S:    Maintained
  F:    Documentation/trace/kmemtrace.txt
 -F:    include/trace/kmemtrace.h
 +F:    include/linux/kmemtrace.h
  F:    kernel/trace/kmemtrace.c
  
  KPROBES
@@@ -3459,6 -3351,7 +3459,6 @@@ P:      David S. Mille
  M:    [email protected]
  P:    Masami Hiramatsu
  M:    [email protected]
 -L:    [email protected]
  S:    Maintained
  F:    Documentation/kprobes.txt
  F:    include/linux/kprobes.h
@@@ -3467,6 -3360,7 +3467,6 @@@ F:      kernel/kprobes.
  KS0108 LCD CONTROLLER DRIVER
  P:    Miguel Ojeda Sandonis
  M:    [email protected]
 -L:    [email protected]
  W:    http://miguelojeda.es/auxdisplay.htm
  W:    http://jair.lab.fi.uva.es/~migojed/auxdisplay.htm
  S:    Maintained
@@@ -3630,6 -3524,7 +3630,6 @@@ P:      Peter Zijlstr
  M:    [email protected]
  P:    Ingo Molnar
  M:    [email protected]
 -L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/peterz/linux-2.6-lockdep.git
  S:    Maintained
  F:    Documentation/lockdep*.txt
@@@ -3681,6 -3576,7 +3681,6 @@@ L:      [email protected] (in 
  W:    http://www.linux-m32r.org/
  S:    Maintained
  F:    arch/m32r/
 -F:    include/asm-m32r/
  
  M68K ARCHITECTURE
  P:    Geert Uytterhoeven
@@@ -3764,6 -3660,7 +3764,6 @@@ F:      include/linux/mv643xx.
  MARVELL SOC MMC/SD/SDIO CONTROLLER DRIVER
  P:    Nicolas Pitre
  M:    [email protected]
 -L:    [email protected]
  S:    Maintained
  
  MARVELL YUKON / SYSKONNECT DRIVER
@@@ -3817,6 -3714,7 +3817,6 @@@ F:      drivers/scsi/megaraid
  
  MEMORY MANAGEMENT
  L:    [email protected]
 -L:    [email protected]
  W:    http://www.linux-mm.org
  S:    Maintained
  F:    include/linux/mm.h
@@@ -3830,6 -3728,7 +3830,6 @@@ M:      [email protected]
  P:    KAMEZAWA Hiroyuki
  M:    [email protected]
  L:    [email protected]
 -L:    [email protected]
  S:    Maintained
  F:    mm/memcontrol.c
  
@@@ -3872,6 -3771,7 +3872,6 @@@ F:      arch/mips
  MISCELLANEOUS MCA-SUPPORT
  P:    James Bottomley
  M:    [email protected]
 -L:    [email protected]
  S:    Maintained
  F:    Documentation/ia64/mca.txt
  F:    Documentation/mca.txt
@@@ -3881,6 -3781,7 +3881,6 @@@ F:      include/linux/mca
  MODULE SUPPORT
  P:    Rusty Russell
  M:    [email protected]
 -L:    [email protected]
  S:    Maintained
  F:    include/linux/module.h
  F:    kernel/module.c
@@@ -3904,6 -3805,7 +3904,6 @@@ F:      drivers/mmc/host/imxmmc.
  MOUSE AND MISC DEVICES [GENERAL]
  P:    Alessandro Rubini
  M:    [email protected]
 -L:    [email protected]
  S:    Maintained
  F:    drivers/input/mouse/
  F:    include/linux/gpio_mouse.h
@@@ -3911,6 -3813,7 +3911,6 @@@
  MOXA SMARTIO/INDUSTIO/INTELLIO SERIAL CARD
  P:    Jiri Slaby
  M:    [email protected]
 -L:    [email protected]
  S:    Maintained
  F:    Documentation/serial/moxa-smartio
  F:    drivers/char/mxser.*
@@@ -3926,6 -3829,7 +3926,6 @@@ F:      drivers/platform/x86/msi-laptop.
  MULTIFUNCTION DEVICES (MFD)
  P:    Samuel Ortiz
  M:    [email protected]
 -L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6.git
  S:    Supported
  F:    drivers/mfd/
@@@ -3933,6 -3837,7 +3933,6 @@@
  MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND SDIO SUBSYSTEM
  P:    Pierre Ossman
  M:    [email protected]
 -L:    [email protected]
  S:    Maintained
  F:    drivers/mmc/
  F:    include/linux/mmc/
@@@ -3940,6 -3845,7 +3940,6 @@@
  MULTIMEDIA CARD (MMC) ETC. OVER SPI
  P:    David Brownell
  M:    [email protected]
 -L:    [email protected]
  S:    Odd Fixes
  F:    drivers/mmc/host/mmc_spi.c
  F:    include/linux/spi/mmc_spi.h
@@@ -3954,6 -3860,7 +3954,6 @@@ F:      sound/oss/msnd
  MULTITECH MULTIPORT CARD (ISICOM)
  P:    Jiri Slaby
  M:    [email protected]
 -L:    [email protected]
  S:    Maintained
  F:    drivers/char/isicom.c
  F:    include/linux/isicom.h
@@@ -4124,7 -4031,7 +4124,7 @@@ T:      git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    net/wireless/
  F:    include/net/ieee80211*
 -F:    include/net/wireless.h
 +F:    include/linux/wireless.h
  
  NETWORKING DRIVERS
  L:    [email protected]
@@@ -4197,6 -4104,7 +4197,6 @@@ NTFS FILESYSTE
  P:    Anton Altaparmakov
  M:    [email protected]
  L:    [email protected]
 -L:    [email protected]
  W:    http://www.linux-ntfs.org/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs-2.6.git
  S:    Maintained
@@@ -4211,69 -4119,6 +4211,69 @@@ S:    Maintaine
  F:    drivers/video/riva/
  F:    drivers/video/nvidia/
  
 +OMAP SUPPORT
 +P:    Tony Lindgren <[email protected]>
 +M:    [email protected]
 +L:    [email protected]
 +W:    http://www.muru.com/linux/omap/
 +W:    http://linux.omap.com/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git
 +S:    Maintained
 +F:    arch/arm/*omap*
 +
 +OMAP CLOCK FRAMEWORK SUPPORT
 +P:    Paul Walmsley
 +M:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    arch/arm/*omap*/*clock*
 +
 +OMAP POWER MANAGEMENT SUPPORT
 +P:    Kevin Hilman
 +M:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    arch/arm/*omap*/*pm*
 +
 +OMAP AUDIO SUPPORT
 +P:    Jarkko Nikula
 +M:    [email protected]
 +L:    [email protected] (subscribers-only)
 +L:    [email protected]
 +S:    Maintained
 +F:    sound/soc/omap/
 +
 +OMAP FRAMEBUFFER SUPPORT
 +P:    Imre Deak
 +M:    [email protected]
 +L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/video/omap/
 +
 +OMAP MMC SUPPORT
 +P:    Jarkko Lavinen
 +M:    [email protected]
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/mmc/host/*omap*
 +
 +OMAP RANDOM NUMBER GENERATOR SUPPORT
 +P:    Deepak Saxena
 +M:    [email protected]
 +S:    Maintained
 +F:    drivers/char/hw_random/omap-rng.c
 +
 +OMAP USB SUPPORT
 +P:    Felipe Balbi
 +M:    [email protected]
 +P:    David Brownell
 +M:    [email protected]
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +
  OMFS FILESYSTEM
  P:    Bob Copeland
  M:    [email protected]
@@@ -4430,6 -4275,7 +4430,6 @@@ M:      [email protected]
  P:    Rusty Russell
  M:    [email protected]
  L:    [email protected]
 -L:    [email protected]
  S:    Supported
  F:    Documentation/ia64/paravirt_ops.txt
  F:    arch/*/kernel/paravirt*
@@@ -4480,6 -4326,7 +4480,6 @@@ F:      include/linux/leds-pca9532.
  PCI ERROR RECOVERY
  P:    Linas Vepstas
  M:    [email protected]
 -L:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    Documentation/PCI/pci-error-recovery.txt
@@@ -4488,6 -4335,7 +4488,6 @@@ F:      Documentation/powerpc/eeh-pci-error-
  PCI SUBSYSTEM
  P:    Jesse Barnes
  M:    [email protected]
 -L:    [email protected]
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6.git
  S:    Supported
@@@ -4522,20 -4370,11 +4522,20 @@@ F:   drivers/net/pcnet32.
  PER-TASK DELAY ACCOUNTING
  P:    Balbir Singh
  M:    [email protected]
 -L:    [email protected]
  S:    Maintained
  F:    include/linux/delayacct.h
  F:    kernel/delayacct.c
  
 +PERFORMANCE COUNTER SUBSYSTEM
 +P:    Peter Zijlstra
 +M:    [email protected]
 +P:    Paul Mackerras
 +M:    [email protected]
 +P:    Ingo Molnar
 +M:    [email protected]
 +L:    [email protected]
 +S:    Supported
 +
  PERSONALITY HANDLING
  P:    Christoph Hellwig
  M:    [email protected]
@@@ -4553,6 -4392,7 +4553,6 @@@ F:      drivers/mtd/devices/phram.
  PKTCDVD DRIVER
  P:    Peter Osterlund
  M:    [email protected]
 -L:    [email protected]
  S:    Maintained
  F:    drivers/block/pktcdvd.c
  F:    include/linux/pktcdvd.h
@@@ -4560,6 -4400,7 +4560,6 @@@
  POSIX CLOCKS and TIMERS
  P:    Thomas Gleixner
  M:    [email protected]
 -L:    [email protected]
  S:    Supported
  F:    fs/timerfd.c
  F:    include/linux/timer*
@@@ -4570,6 -4411,7 +4570,6 @@@ P:      Anton Vorontso
  M:    [email protected]
  P:    David Woodhouse
  M:    [email protected]
 -L:    [email protected]
  T:    git git://git.infradead.org/battery-2.6.git
  S:    Maintained
  F:    include/linux/power_supply.h
@@@ -4618,16 -4460,10 +4618,16 @@@ S:   Maintaine
  F:    drivers/net/pppol2tp.c
  F:    include/linux/if_pppol2tp.h
  
 +PPS SUPPORT
 +P:    Rodolfo Giometti
 +M:    [email protected]
 +W:    http://wiki.enneenne.com/index.php/LinuxPPS_support
 +L:    [email protected] (subscribers-only)
 +S:    Maintained
 +
  PREEMPTIBLE KERNEL
  P:    Robert Love
  M:    [email protected]
 -L:    [email protected]
  L:    [email protected]
  W:    ftp://ftp.kernel.org/pub/linux/kernel/people/rml/preempt-kernel
  S:    Supported
@@@ -4656,8 -4492,8 +4656,8 @@@ S:      Maintaine
  F:    drivers/ata/sata_promise.*
  
  PS3 NETWORK SUPPORT
 -P:    Masakazu Mokuno
 -M:    [email protected]
 +P:    Geoff Levand
 +M:    [email protected]
  L:    [email protected]
  L:    [email protected]
  S:    Supported
@@@ -4690,6 -4526,7 +4690,6 @@@ P:      Roland McGrat
  M:    [email protected]
  P:    Oleg Nesterov
  M:    [email protected]
 -L:    [email protected]
  S:    Maintained
  F:    include/asm-generic/syscall.h
  F:    include/linux/ptrace.h
@@@ -4710,7 -4547,7 +4710,7 @@@ F:      drivers/media/video/pvrusb2
  
  PXA2xx/PXA3xx SUPPORT
  P:    Eric Miao
 -M:    eric.miao@marvell.com
 +M:    eric.y.miao@gmail.com
  P:    Russell King
  M:    [email protected]
  L:    [email protected] (subscribers-only)
@@@ -4725,19 -4562,19 +4725,19 @@@ F:   sound/soc/px
  
  PXA168 SUPPORT
  P:    Eric Miao
 -M:    eric.miao@marvell.com
 +M:    eric.y.miao@gmail.com
  P:    Jason Chagas
  M:    [email protected]
  L:    [email protected] (subscribers-only)
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git
 -S:    Supported
 +S:    Maintained
  
  PXA910 SUPPORT
  P:    Eric Miao
 -M:    eric.miao@marvell.com
 +M:    eric.y.miao@gmail.com
  L:    [email protected] (subscribers-only)
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git
 -S:    Supported
 +S:    Maintained
  
  PXA MMCI DRIVER
  S:    Orphan
@@@ -4775,6 -4612,7 +4775,6 @@@ F:      drivers/net/qlge
  QNX4 FILESYSTEM
  P:    Anders Larsen
  M:    [email protected]
 -L:    [email protected]
  W:    http://www.alarsen.net/linux/qnx4fs/
  S:    Maintained
  F:    fs/qnx4/
@@@ -4821,6 -4659,7 +4821,6 @@@ F:      drivers/char/random.
  RAPIDIO SUBSYSTEM
  P:    Matt Porter
  M:    [email protected]
 -L:    [email protected]
  S:    Maintained
  F:    drivers/rapidio/
  
@@@ -4834,8 -4673,7 +4834,8 @@@ F:      drivers/net/wireless/ray
  RCUTORTURE MODULE
  P:    Josh Triplett
  M:    [email protected]
 -L:    [email protected]
 +P:    Paul E. McKenney
 +M:    [email protected]
  S:    Maintained
  F:    Documentation/RCU/torture.txt
  F:    kernel/rcutorture.c
@@@ -4843,6 -4681,7 +4843,6 @@@
  RDC R-321X SoC
  P:    Florian Fainelli
  M:    [email protected]
 -L:    [email protected]
  S:    Maintained
  
  RDC R6040 FAST ETHERNET DRIVER
@@@ -4855,16 -4694,15 +4855,16 @@@ F:   drivers/net/r6040.
  RDS - RELIABLE DATAGRAM SOCKETS
  P:    Andy Grover
  M:    [email protected]
 -L:    [email protected]
 +L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  F:    net/rds/
  
  READ-COPY UPDATE (RCU)
  P:    Dipankar Sarma
  M:    [email protected]
 +P:    Paul E. McKenney
 +M:    [email protected]
  W:    http://www.rdrop.com/users/paulmck/rclock/
 -L:    [email protected]
  S:    Supported
  F:    Documentation/RCU/rcu.txt
  F:    Documentation/RCU/rcuref.txt
@@@ -4875,6 -4713,7 +4875,6 @@@ F:      kernel/rcupdate.
  REAL TIME CLOCK DRIVER
  P:    Paul Gortmaker
  M:    [email protected]
 -L:    [email protected]
  S:    Maintained
  F:    Documentation/rtc.txt
  F:    drivers/rtc/
@@@ -4895,9 -4734,9 +4895,9 @@@ S:      Supporte
  F:    fs/reiserfs/
  
  RFKILL
 -P:    Ivo van Doorn
 -M:    [email protected]
 -L:    netdev@vger.kernel.org
 +P:    Johannes Berg
 +M:    [email protected]
 +L:    linux-wireless@vger.kernel.org
  S:    Maintained
  F     Documentation/rfkill.txt
  F:    net/rfkill/
@@@ -5012,6 -4851,7 +5012,6 @@@ S3C24XX SD/MMC Drive
  P:    Ben Dooks
  M:    [email protected]
  L:    [email protected] (subscribers-only)
 -L:    [email protected]
  S:    Supported
  F:    drivers/mmc/host/s3cmci.*
  
@@@ -5037,6 -4877,7 +5037,6 @@@ P:      Ingo Molna
  M:    [email protected]
  P:    Peter Zijlstra
  M:    [email protected]
 -L:    [email protected]
  S:    Maintained
  F:    kernel/sched*
  F:    include/linux/sched.h
@@@ -5135,16 -4976,10 +5135,16 @@@ L:   [email protected]
  S:    Maintained
  F:    drivers/mmc/host/sdhci.*
  
 +SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) SAMSUNG DRIVER
 +P:    Ben Dooks
 +M:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/mmc/host/sdhci-s3c.c
 +
  SECURITY SUBSYSTEM
  P:    James Morris
  M:    [email protected]
 -L:    [email protected]
  L:    [email protected] (suggested Cc:)
  T:    git git://www.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git
  W:    http://security.wiki.kernel.org/
@@@ -5163,6 -4998,7 +5163,6 @@@ P:      James Morri
  M:    [email protected]
  P:    Eric Paris
  M:    [email protected]
 -L:    [email protected] (kernel issues)
  L:    [email protected] (subscribers-only, general discussion)
  W:    http://selinuxproject.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git
@@@ -5259,6 -5095,7 +5259,6 @@@ P:      Vincent Sander
  M:    [email protected]
  W:    http://www.simtec.co.uk/products/EB110ATX/
  S:    Supported
 -F:    arch/arm/mach-ebsa110/
  
  SIMTEC EB2410ITX (BAST)
  P:    Ben Dooks
@@@ -5425,6 -5262,7 +5425,6 @@@ F:      include/linux/sony-laptop.
  SONY MEMORYSTICK CARD SUPPORT
  P:    Alex Dubov
  M:    [email protected]
 -L:    [email protected]
  W:    http://tifmxx.berlios.de/
  S:    Maintained
  F:    drivers/memstick/host/tifm_ms.c
@@@ -5434,7 -5272,7 +5434,7 @@@ P:      Jaroslav Kysel
  M:    [email protected]
  P:    Takashi Iwai
  M:    [email protected]
 -L:    [email protected] (subscribers-only)
 +L:    [email protected] (moderated for non-subscribers)
  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
@@@ -5449,7 -5287,7 +5449,7 @@@ M:      [email protected]
  P:    Mark Brown
  M:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git
 -L:    [email protected] (subscribers-only)
 +L:    [email protected] (moderated for non-subscribers)
  W:    http://alsa-project.org/main/index.php/ASoC
  S:    Supported
  F:    sound/soc/
@@@ -5467,6 -5305,7 +5467,6 @@@ F:      arch/sparc
  SPECIALIX IO8+ MULTIPORT SERIAL CARD DRIVER
  P:    Roger Wolff
  M:    [email protected]
 -L:    [email protected]
  S:    Supported
  F:    Documentation/serial/specialix.txt
  F:    drivers/char/specialix*
@@@ -5512,6 -5351,7 +5512,6 @@@ F:      fs/squashfs
  SRM (Alpha) environment access
  P:    Jan-Benedict Glaw
  M:    [email protected]
 -L:    [email protected]
  S:    Maintained
  F:    arch/alpha/kernel/srm_env.c
  
@@@ -5526,8 -5366,8 +5526,8 @@@ S:      Maintaine
  STAGING SUBSYSTEM
  P:    Greg Kroah-Hartman
  M:    [email protected]
 -L:    [email protected]
  T:    quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/
 +L:    [email protected]
  S:    Maintained
  F:    drivers/staging/
  
@@@ -5606,6 -5446,7 +5606,6 @@@ F:      include/linux/sysv_fs.
  TASKSTATS STATISTICS INTERFACE
  P:    Balbir Singh
  M:    [email protected]
 -L:    [email protected]
  S:    Maintained
  F:    Documentation/accounting/taskstats*
  F:    include/linux/taskstats*
@@@ -5668,6 -5509,27 +5668,13 @@@ F:    drivers/misc/tifm
  F:    drivers/mmc/host/tifm_sd.c
  F:    include/linux/tifm.h
  
 -TI OMAP MMC INTERFACE DRIVER
 -P:    Carlos Aguiar, Anderson Briglia and Syed Khasim
 -M:    [email protected]
 -W:    http://linux.omap.com
 -W:    http://www.muru.com/linux/omap/
 -S:    Maintained
 -F:    drivers/mmc/host/omap.c
 -
 -TI OMAP RANDOM NUMBER GENERATOR SUPPORT
 -P:    Deepak Saxena
 -M:    [email protected]
 -S:    Maintained
 -F:    drivers/char/hw_random/omap-rng.c
 -
+ TI TWL4030 SERIES SOC CODEC DRIVER
+ P:    Peter Ujfalusi
+ M:    [email protected]
+ L:    [email protected] (moderated for non-subscribers)
+ S:    Maintained
+ F:    sound/soc/codecs/twl4030*
+ 
  TIPC NETWORK LAYER
  P:    Per Liden
  M:    [email protected]
@@@ -5698,6 -5560,7 +5705,6 @@@ P:      Kentaro Taked
  M:    [email protected]
  P:    Tetsuo Handa
  M:    [email protected]
 -L:    [email protected] (kernel issues)
  L:    [email protected] (subscribers-only, for developers and users in English)
  L:    [email protected] (subscribers-only, for developers in Japanese)
  L:    [email protected] (subscribers-only, for users in Japanese)
@@@ -5725,14 -5588,6 +5732,14 @@@ M:    [email protected]
  S:    Maintained
  F:    drivers/mmc/host/tmio_mmc.*
  
 +TMPFS (SHMEM FILESYSTEM)
 +P:    Hugh Dickins
 +M:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    include/linux/shmem_fs.h
 +F:    mm/shmem.c
 +
  TPM DEVICE DRIVER
  P:    Debora Velarde
  M:    [email protected]
@@@ -5749,19 -5604,15 +5756,19 @@@ F:   drivers/char/tpm
  TRIVIAL PATCHES
  P:    Jiri Kosina
  M:    [email protected]
 -L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git
  S:    Maintained
 +F:    drivers/char/tty_*
 +F:    drivers/serial/serial_core.c
 +F:    include/linux/serial_core.h
 +F:    include/linux/serial.h
 +F:    include/linux/tty.h
  
  TTY LAYER
  P:    Alan Cox
  M:    [email protected]
 -L:    [email protected]
  S:    Maintained
 +T:    stgit http://zeniv.linux.org.uk/~alan/ttydev/
  
  TULIP NETWORK DRIVERS
  P:    Grant Grundler
@@@ -5832,6 -5683,7 +5839,6 @@@ F:      fs/udf
  UFS FILESYSTEM
  P:    Evgeniy Dushistov
  M:    [email protected]
 -L:    [email protected]
  S:    Maintained
  F:    Documentation/filesystems/ufs.txt
  F:    fs/ufs/
@@@ -5848,6 -5700,7 +5855,6 @@@ F:      include/linux/uwb
  UNIFORM CDROM DRIVER
  P:    Jens Axboe
  M:    [email protected]
 -L:    [email protected]
  W:    http://www.kernel.dk
  S:    Maintained
  F:    Documentation/cdrom/
@@@ -5876,6 -5729,7 +5883,6 @@@ F:      drivers/usb/class/cdc-acm.
  USB BLOCK DRIVER (UB ub)
  P:    Pete Zaitcev
  M:    [email protected]
 -L:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    drivers/block/ub.c
@@@ -6168,12 -6022,6 +6175,12 @@@ L:    [email protected]
  S:    Maintained
  F:    drivers/net/wireless/rndis_wlan.c
  
 +USB XHCI DRIVER
 +P:    Sarah Sharp
 +M:    [email protected]
 +L:    [email protected]
 +S:    Supported
 +
  USB ZC0301 DRIVER
  P:    Luca Risolia
  M:    [email protected]
@@@ -6221,6 -6069,7 +6228,6 @@@ P:      Hans J. Koc
  M:    [email protected]
  P:    Greg Kroah-Hartman
  M:    [email protected]
 -L:    [email protected]
  S:    Maintained
  F:    Documentation/DocBook/uio-howto.tmpl
  F:    drivers/uio/
@@@ -6246,6 -6095,7 +6253,6 @@@ F:      drivers/video/uvesafb.
  VFAT/FAT/MSDOS FILESYSTEM
  P:    OGAWA Hirofumi
  M:    [email protected]
 -L:    [email protected]
  S:    Maintained
  F:    Documentation/filesystems/vfat.txt
  F:    fs/fat/
@@@ -6264,14 -6114,6 +6271,14 @@@ S:    Maintaine
  F:    Documentation/i2c/busses/i2c-viapro
  F:    drivers/i2c/busses/i2c-viapro.c
  
 +VIA SD/MMC CARD CONTROLLER DRIVER
 +P:    Joseph Chan
 +M:    [email protected]
 +P:    Harald Welte
 +M:    [email protected]
 +S:    Maintained
 +F:    drivers/mmc/host/via-sdmmc.c
 +
  VIA UNICHROME(PRO)/CHROME9 FRAMEBUFFER DRIVER
  P:    Joseph Chan
  M:    [email protected]
@@@ -6297,14 -6139,6 +6304,14 @@@ F:    drivers/net/macvlan.
  F:    include/linux/if_*vlan.h
  F:    net/8021q/
  
 +VLYNQ BUS
 +P:    Florian Fainelli
 +M:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/vlynq/vlynq.c
 +F:    include/linux/vlynq.h
 +
  VOLTAGE AND CURRENT REGULATOR FRAMEWORK
  P:    Liam Girdwood
  M:    [email protected]
@@@ -6358,6 -6192,7 +6365,6 @@@ F:      drivers/hwmon/w83793.
  W83L51xD SD/MMC CARD INTERFACE DRIVER
  P:    Pierre Ossman
  M:    [email protected]
 -L:    [email protected]
  S:    Maintained
  F:    drivers/mmc/host/wbsd.*
  
@@@ -6444,6 -6279,7 +6451,6 @@@ M:      [email protected]
  P:    H. Peter Anvin
  M:    [email protected]
  M:    [email protected]
 -L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git
  S:    Maintained
  F:    Documentation/x86/
@@@ -6479,6 -6315,7 +6486,6 @@@ XILINX SYSTEMACE DRIVE
  P:    Grant Likely
  M:    [email protected]
  W:    http://www.secretlab.ca/
 -L:    [email protected]
  S:    Maintained
  F:    drivers/block/xsysace.c
  
@@@ -6543,9 -6380,5 +6550,9 @@@ F:      drivers/serial/zs.
  
  THE REST
  P:    Linus Torvalds
 +M:    [email protected]
 +L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
  S:    Buried alive in reporters
 +F:    *
 +F:    */