git://ftp.safe.ca / safe / jmp / linux-2.6 / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
ipv4: Use synchronize_rcu() during trie_rebalance()
[safe/jmp/linux-2.6] / MAINTAINERS
diff --git a/MAINTAINERS b/MAINTAINERS
index bfbd5be..57ea979 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -36,6 +36,12 @@ trivial patch so apply some common sense.
        (scripts/checkpatch.pl) to catch trival style violations.
        See Documentation/CodingStyle for guidance here.
 
        (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.
        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.
@@ -157,9 +163,10 @@ S: Maintained
 F:     drivers/net/r8169.c
 
 8250/16?50 (AND CLONE UARTS) SERIAL DRIVER
 F:     drivers/net/r8169.c
 
 8250/16?50 (AND CLONE UARTS) SERIAL DRIVER
+P:     Alan Cox
+M:     alan@lxorguk.ukuu.org.uk
 L:     linux-serial@vger.kernel.org
 W:     http://serial.sourceforge.net
 L:     linux-serial@vger.kernel.org
 W:     http://serial.sourceforge.net
-M:     alan@lxorguk.ukuu.org.uk
 S:     Odd Fixes
 F:     drivers/serial/8250*
 F:     include/linux/serial_8250.h
 S:     Odd Fixes
 F:     drivers/serial/8250*
 F:     include/linux/serial_8250.h
@@ -223,6 +230,13 @@ L: linux-acenic@sunsite.dk
 S:     Maintained
 F:     drivers/net/acenic*
 
 S:     Maintained
 F:     drivers/net/acenic*
 
+ACER ASPIRE ONE TEMPERATURE AND FAN DRIVER
+P: Peter Feuerer
+M: peter@piie.net
+W: http://piie.net/?section=acerhdf
+S: Maintained
+F: drivers/platform/x86/acerhdf.c
+
 ACER WMI LAPTOP EXTRAS
 P:     Carlos Corbacho
 M:     carlos@strangeworlds.co.uk
 ACER WMI LAPTOP EXTRAS
 P:     Carlos Corbacho
 M:     carlos@strangeworlds.co.uk
@@ -646,6 +660,8 @@ M:  laforge@openezx.org
 L:     openezx-devel@lists.openezx.org (subscribers-only)
 W:     http://www.openezx.org/
 S:     Maintained
 L:     openezx-devel@lists.openezx.org (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
 
 ARM/FARADAY FA526 PORT
 P:     Paulius Zaleckas
@@ -767,11 +783,25 @@ P:        Philipp Zabel
 M:     philipp.zabel@gmail.com
 S:     Maintained
 
 M:     philipp.zabel@gmail.com
 S:     Maintained
 
+ARM/MIOA701 MACHINE SUPPORT
+P:     Robert Jarzmik
+M:     robert.jarzmik@free.fr
+L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+F:     arch/arm/mach-pxa/mioa701.c
+S:     Maintained
+
 ARM/NEC MOBILEPRO 900/c MACHINE SUPPORT
 P:     Michael Petchkovsky
 M:     mkpetch@internode.on.net
 S:     Maintained
 
 ARM/NEC MOBILEPRO 900/c MACHINE SUPPORT
 P:     Michael Petchkovsky
 M:     mkpetch@internode.on.net
 S:     Maintained
 
+ARM/OPENMOKO NEO FREERUNNER (GTA02) MACHINE SUPPORT
+P:     Nelson Castillo
+M:     arhuaco@freaks-unidos.net
+L:     openmoko-kernel@lists.openmoko.org (subscribers-only)
+W:     http://wiki.openmoko.org/wiki/Neo_FreeRunner
+S:     Supported
+
 ARM/TOSA MACHINE SUPPORT
 P:     Dmitry Eremin-Solenikov
 M:     dbaryshkov@gmail.com
 ARM/TOSA MACHINE SUPPORT
 P:     Dmitry Eremin-Solenikov
 M:     dbaryshkov@gmail.com
@@ -785,6 +815,12 @@ M: marek.vasut@gmail.com
 W:     http://hackndev.com
 S:     Maintained
 
 W:     http://hackndev.com
 S:     Maintained
 
+ARM/PALM TREO 680 SUPPORT
+P:     Tomas Cech
+M:     sleep_walker@suse.cz
+W:     http://hackndev.com
+S:     Maintained
+
 ARM/PALMZ72 SUPPORT
 P:     Sergey Lapin
 M:     slapin@ossfans.org
 ARM/PALMZ72 SUPPORT
 P:     Sergey Lapin
 M:     slapin@ossfans.org
@@ -831,12 +867,22 @@ M:        alex@shark-linux.de
 W:     http://www.shark-linux.de/shark.html
 S:     Maintained
 
 W:     http://www.shark-linux.de/shark.html
 S:     Maintained
 
+ARM/SAMSUNG ARM ARCHITECTURES
+P:     Ben Dooks
+M:     ben-linux@fluff.org
+L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+W:     http://www.fluff.org/ben/linux/
+S:     Maintained
+F:     arch/arm/plat-s3c/
+F:     arch/arm/plat-s3c24xx/
+
 ARM/S3C2410 ARM ARCHITECTURE
 P:     Ben Dooks
 M:     ben-linux@fluff.org
 L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 W:     http://www.fluff.org/ben/linux/
 S:     Maintained
 ARM/S3C2410 ARM ARCHITECTURE
 P:     Ben Dooks
 M:     ben-linux@fluff.org
 L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 W:     http://www.fluff.org/ben/linux/
 S:     Maintained
+F:     arch/arm/mach-s3c2410/
 
 ARM/S3C2440 ARM ARCHITECTURE
 P:     Ben Dooks
 
 ARM/S3C2440 ARM ARCHITECTURE
 P:     Ben Dooks
@@ -844,6 +890,39 @@ M: ben-linux@fluff.org
 L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 W:     http://www.fluff.org/ben/linux/
 S:     Maintained
 L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 W:     http://www.fluff.org/ben/linux/
 S:     Maintained
+F:     arch/arm/mach-s3c2440/
+
+ARM/S3C2442 ARM ARCHITECTURE
+P:     Ben Dooks
+M:     ben-linux@fluff.org
+L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+W:     http://www.fluff.org/ben/linux/
+S:     Maintained
+F:     arch/arm/mach-s3c2442/
+
+ARM/S3C2443 ARM ARCHITECTURE
+P:     Ben Dooks
+M:     ben-linux@fluff.org
+L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+W:     http://www.fluff.org/ben/linux/
+S:     Maintained
+F:     arch/arm/mach-s3c2443/
+
+ARM/S3C6400 ARM ARCHITECTURE
+P:     Ben Dooks
+M:     ben-linux@fluff.org
+L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+W:     http://www.fluff.org/ben/linux/
+S:     Maintained
+F:     arch/arm/mach-s3c6400/
+
+ARM/S3C6410 ARM ARCHITECTURE
+P:     Ben Dooks
+M:     ben-linux@fluff.org
+L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+W:     http://www.fluff.org/ben/linux/
+S:     Maintained
+F:     arch/arm/mach-s3c6410/
 
 ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT
 P:     Lennert Buytenhek
 
 ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT
 P:     Lennert Buytenhek
@@ -884,8 +963,7 @@ M:  corentincj@iksaif.net
 P:     Karol Kozimor
 M:     sziwan@users.sourceforge.net
 L:     acpi4asus-user@lists.sourceforge.net
 P:     Karol Kozimor
 M:     sziwan@users.sourceforge.net
 L:     acpi4asus-user@lists.sourceforge.net
-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
 S:     Maintained
 F:     arch/x86/kernel/acpi/boot.c
 F:     drivers/platform/x86/asus_acpi.c
@@ -901,8 +979,7 @@ ASUS LAPTOP EXTRAS DRIVER
 P:     Corentin Chary
 M:     corentincj@iksaif.net
 L:     acpi4asus-user@lists.sourceforge.net
 P:     Corentin Chary
 M:     corentincj@iksaif.net
 L:     acpi4asus-user@lists.sourceforge.net
-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
 
 S:     Maintained
 F:     drivers/platform/x86/asus-laptop.c
 
@@ -939,7 +1016,7 @@ M: me@bobcopeland.com
 L:     linux-wireless@vger.kernel.org
 L:     ath5k-devel@lists.ath5k.org
 S:     Maintained
 L:     linux-wireless@vger.kernel.org
 L:     ath5k-devel@lists.ath5k.org
 S:     Maintained
-F:     drivers/net/wireless/ath5k/
+F:     drivers/net/wireless/ath/ath5k/
 
 ATHEROS ATH9K WIRELESS DRIVER
 P:     Luis R. Rodriguez
 
 ATHEROS ATH9K WIRELESS DRIVER
 P:     Luis R. Rodriguez
@@ -955,7 +1032,7 @@ M: senthilkumar@atheros.com
 L:     linux-wireless@vger.kernel.org
 L:     ath9k-devel@lists.ath9k.org
 S:     Supported
 L:     linux-wireless@vger.kernel.org
 L:     ath9k-devel@lists.ath9k.org
 S:     Supported
-F:     drivers/net/wireless/ath9k/
+F:     drivers/net/wireless/ath/ath9k/
 
 ATHEROS AR9170 WIRELESS DRIVER
 P:     Christian Lamparter
 
 ATHEROS AR9170 WIRELESS DRIVER
 P:     Christian Lamparter
@@ -963,7 +1040,7 @@ M: chunkeey@web.de
 L:     linux-wireless@vger.kernel.org
 W:     http://wireless.kernel.org/en/users/Drivers/ar9170
 S:     Maintained
 L:     linux-wireless@vger.kernel.org
 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
 
 ATI_REMOTE2 DRIVER
 P:     Ville Syrjala
@@ -1003,6 +1080,13 @@ W:       http://www.at91.com/
 S:     Maintained
 F:     drivers/mmc/host/at91_mci.c
 
 S:     Maintained
 F:     drivers/mmc/host/at91_mci.c
 
+ATMEL AT91 / AT32 MCI DRIVER
+P:     Nicolas Ferre
+M:     nicolas.ferre@atmel.com
+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:     hskinnemoen@atmel.com
 ATMEL AT91 / AT32 SERIAL DRIVER
 P:     Haavard Skinnemoen
 M:     hskinnemoen@atmel.com
@@ -1451,6 +1535,7 @@ P:        Joe Eykholt
 M:     jeykholt@cisco.com
 L:     linux-scsi@vger.kernel.org
 S:     Supported
 M:     jeykholt@cisco.com
 L:     linux-scsi@vger.kernel.org
 S:     Supported
+F:     drivers/scsi/fnic/
 
 CODA FILE SYSTEM
 P:     Jan Harkes
 
 CODA FILE SYSTEM
 P:     Jan Harkes
@@ -1536,6 +1621,7 @@ L:        containers@lists.linux-foundation.org
 S:     Maintained
 F:     include/linux/cgroup*
 F:     kernel/cgroup*
 S:     Maintained
 F:     include/linux/cgroup*
 F:     kernel/cgroup*
+F:     mm/*cgroup*
 
 CORETEMP HARDWARE MONITORING DRIVER
 P:     Rudolf Marek
 
 CORETEMP HARDWARE MONITORING DRIVER
 P:     Rudolf Marek
@@ -1598,7 +1684,7 @@ P:        Mikael Starvik
 M:     starvik@axis.com
 P:     Jesper Nilsson
 M:     jesper.nilsson@axis.com
 M:     starvik@axis.com
 P:     Jesper Nilsson
 M:     jesper.nilsson@axis.com
-L:     dev-etrax@axis.com
+L:     linux-cris-kernel@axis.com
 W:     http://developer.axis.com
 S:     Maintained
 F:     arch/cris/
 W:     http://developer.axis.com
 S:     Maintained
 F:     arch/cris/
@@ -2044,9 +2130,9 @@ F:        drivers/edac/i5400_edac.c
 
 EDAC-I82975X
 P:     Ranganathan Desikan
 
 EDAC-I82975X
 P:     Ranganathan Desikan
+M:     ravi@jetztechnologies.com
 P:     Arvind R.
 P:     Arvind R.
-M:     rdesikan@jetzbroadband.com
-M:     arvind@acarlab.com
+M:     arvind@jetztechnologies.com
 L:     bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:     bluesmoke.sourceforge.net
 S:     Maintained
 L:     bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:     bluesmoke.sourceforge.net
 S:     Maintained
@@ -2072,7 +2158,7 @@ EEEPC LAPTOP EXTRAS DRIVER
 P:     Corentin Chary
 M:     corentincj@iksaif.net
 L:     acpi4asus-user@lists.sourceforge.net
 P:     Corentin Chary
 M:     corentincj@iksaif.net
 L:     acpi4asus-user@lists.sourceforge.net
-W:     http://sourceforge.net/projects/acpi4asus
+W:     http://acpi4asus.sf.net
 S:     Maintained
 F:     drivers/platform/x86/eeepc-laptop.c
 
 S:     Maintained
 F:     drivers/platform/x86/eeepc-laptop.c
 
@@ -2266,11 +2352,9 @@ F:       drivers/net/wan/dlci.c
 F:     drivers/net/wan/sdla.c
 
 FRAMEBUFFER LAYER
 F:     drivers/net/wan/sdla.c
 
 FRAMEBUFFER LAYER
-P:     Antonino Daplas
-M:     adaplas@gmail.com
 L:     linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:     http://linux-fbdev.sourceforge.net/
 L:     linux-fbdev-devel@lists.sourceforge.net (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
 F:     Documentation/fb/
 F:     drivers/video/fb*
 F:     include/linux/fb.h
@@ -2383,7 +2467,7 @@ FTRACE
 P:     Steven Rostedt
 M:     rostedt@goodmis.org
 S:     Maintained
 P:     Steven Rostedt
 M:     rostedt@goodmis.org
 S:     Maintained
-F:     Documentation/ftrace.txt
+F:     Documentation/trace/ftrace.txt
 F:     arch/*/*/*/ftrace.h
 F:     arch/*/kernel/ftrace.c
 F:     include/*/ftrace.h
 F:     arch/*/*/*/ftrace.h
 F:     arch/*/kernel/ftrace.c
 F:     include/*/ftrace.h
@@ -2446,6 +2530,14 @@ F:       drivers/net/wan/pc300too.c
 F:     drivers/net/wan/pci200syn.c
 F:     drivers/net/wan/wanxl*
 
 F:     drivers/net/wan/pci200syn.c
 F:     drivers/net/wan/wanxl*
 
+GENERIC INCLUDE/ASM HEADER FILES
+P:     Arnd Bergmann
+M:     arnd@arndb.de
+L:     linux-arch@vger.kernel.org
+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:     swhiteho@redhat.com
 GFS2 FILE SYSTEM
 P:     Steven Whitehouse
 M:     swhiteho@redhat.com
@@ -2759,7 +2851,9 @@ S:        Maintained
 
 IA64 (Itanium) PLATFORM
 P:     Tony Luck
 
 IA64 (Itanium) PLATFORM
 P:     Tony Luck
+P:     Fenghua Yu
 M:     tony.luck@intel.com
 M:     tony.luck@intel.com
+M:     fenghua.yu@intel.com
 L:     linux-ia64@vger.kernel.org
 W:     http://www.ia64-linux.org/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git
 L:     linux-ia64@vger.kernel.org
 W:     http://www.ia64-linux.org/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git
@@ -2788,10 +2882,10 @@ S:      Supported
 F:     drivers/scsi/ips.*
 
 IDE SUBSYSTEM
 F:     drivers/scsi/ips.*
 
 IDE SUBSYSTEM
-P:     Bartlomiej Zolnierkiewicz
-M:     bzolnier@gmail.com
+P:     David S. Miller
+M:     davem@davemloft.net
 L:     linux-ide@vger.kernel.org
 L:     linux-ide@vger.kernel.org
-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/
 S:     Maintained
 F:     Documentation/ide/
 F:     drivers/ide/
@@ -2837,12 +2931,12 @@ P:      Dmitry Eremin-Solenikov
 M:     dbaryshkov@gmail.com
 P:     Sergey Lapin
 M:     slapin@ossfans.org
 M:     dbaryshkov@gmail.com
 P:     Sergey Lapin
 M:     slapin@ossfans.org
-L:     linux-zigbee-devel@lists.sourceforge.net
+L:     linux-zigbee-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:     http://apps.sourceforge.net/trac/linux-zigbee
 W:     http://apps.sourceforge.net/trac/linux-zigbee
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/lumag/lowpan.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/lowpan/lowpan.git
 S:     Maintained
 F:     net/ieee802154/
 S:     Maintained
 F:     net/ieee802154/
-F:     drivers/ieee801254/
+F:     drivers/ieee802154/
 
 INTEGRITY MEASUREMENT ARCHITECTURE (IMA)
 P:     Mimi Zohar
 
 INTEGRITY MEASUREMENT ARCHITECTURE (IMA)
 P:     Mimi Zohar
@@ -3216,7 +3310,6 @@ W:        http://www.linux-mtd.infradead.org/doc/jffs2.html
 S:     Maintained
 F:     fs/jffs2/
 F:     include/linux/jffs2.h
 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
 
 JOURNALLING LAYER FOR BLOCK DEVICES (JBD)
 P:     Stephen Tweedie
@@ -3376,6 +3469,14 @@ F:       drivers/serial/kgdboc.c
 F:     include/linux/kgdb.h
 F:     kernel/kgdb.c
 
 F:     include/linux/kgdb.h
 F:     kernel/kgdb.c
 
+KMEMCHECK
+P:     Vegard Nossum
+M:     vegardno@ifi.uio.no
+P      Pekka Enberg
+M:     penberg@cs.helsinki.fi
+L:     linux-kernel@vger.kernel.org
+S:     Maintained
+
 KMEMLEAK
 P:     Catalin Marinas
 M:     catalin.marinas@arm.com
 KMEMLEAK
 P:     Catalin Marinas
 M:     catalin.marinas@arm.com
@@ -3391,7 +3492,7 @@ P:        Eduard - Gabriel Munteanu
 M:     eduard.munteanu@linux360.ro
 S:     Maintained
 F:     Documentation/trace/kmemtrace.txt
 M:     eduard.munteanu@linux360.ro
 S:     Maintained
 F:     Documentation/trace/kmemtrace.txt
-F:     include/trace/kmemtrace.h
+F:     include/linux/kmemtrace.h
 F:     kernel/trace/kmemtrace.c
 
 KPROBES
 F:     kernel/trace/kmemtrace.c
 
 KPROBES
@@ -3988,6 +4089,7 @@ L:        netfilter@vger.kernel.org
 L:     coreteam@netfilter.org
 W:     http://www.netfilter.org/
 W:     http://www.iptables.org/
 L:     coreteam@netfilter.org
 W:     http://www.netfilter.org/
 W:     http://www.iptables.org/
+T:     git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6.git
 S:     Supported
 F:     include/linux/netfilter*
 F:     include/linux/netfilter/
 S:     Supported
 F:     include/linux/netfilter*
 F:     include/linux/netfilter/
@@ -4068,7 +4170,7 @@ T:        git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git
 S:     Maintained
 F:     net/wireless/
 F:     include/net/ieee80211*
 S:     Maintained
 F:     net/wireless/
 F:     include/net/ieee80211*
-F:     include/net/wireless.h
+F:     include/linux/wireless.h
 
 NETWORKING DRIVERS
 L:     netdev@vger.kernel.org
 
 NETWORKING DRIVERS
 L:     netdev@vger.kernel.org
@@ -4562,6 +4664,13 @@ S:       Maintained
 F:     drivers/net/pppol2tp.c
 F:     include/linux/if_pppol2tp.h
 
 F:     drivers/net/pppol2tp.c
 F:     include/linux/if_pppol2tp.h
 
+PPS SUPPORT
+P:     Rodolfo Giometti
+M:     giometti@enneenne.com
+W:     http://wiki.enneenne.com/index.php/LinuxPPS_support
+L:     linuxpps@ml.enneenne.com (subscribers-only)
+S:     Maintained
+
 PREEMPTIBLE KERNEL
 P:     Robert Love
 M:     rml@tech9.net
 PREEMPTIBLE KERNEL
 P:     Robert Love
 M:     rml@tech9.net
@@ -4771,6 +4880,8 @@ F:        drivers/net/wireless/ray*
 RCUTORTURE MODULE
 P:     Josh Triplett
 M:     josh@freedesktop.org
 RCUTORTURE MODULE
 P:     Josh Triplett
 M:     josh@freedesktop.org
+P:     Paul E. McKenney
+M:     paulmck@linux.vnet.ibm.com
 S:     Maintained
 F:     Documentation/RCU/torture.txt
 F:     kernel/rcutorture.c
 S:     Maintained
 F:     Documentation/RCU/torture.txt
 F:     kernel/rcutorture.c
@@ -4797,6 +4908,8 @@ F:        net/rds/
 READ-COPY UPDATE (RCU)
 P:     Dipankar Sarma
 M:     dipankar@in.ibm.com
 READ-COPY UPDATE (RCU)
 P:     Dipankar Sarma
 M:     dipankar@in.ibm.com
+P:     Paul E. McKenney
+M:     paulmck@linux.vnet.ibm.com
 W:     http://www.rdrop.com/users/paulmck/rclock/
 S:     Supported
 F:     Documentation/RCU/rcu.txt
 W:     http://www.rdrop.com/users/paulmck/rclock/
 S:     Supported
 F:     Documentation/RCU/rcu.txt
@@ -5068,6 +5181,13 @@ L:       sdhci-devel@lists.ossman.eu
 S:     Maintained
 F:     drivers/mmc/host/sdhci.*
 
 S:     Maintained
 F:     drivers/mmc/host/sdhci.*
 
+SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) SAMSUNG DRIVER
+P:     Ben Dooks
+M:     ben-linux@fluff.org
+L:     sdhci-devel@lists.ossman.eu
+S:     Maintained
+F:     drivers/mmc/host/sdhci-s3c.c
+
 SECURITY SUBSYSTEM
 P:     James Morris
 M:     jmorris@namei.org
 SECURITY SUBSYSTEM
 P:     James Morris
 M:     jmorris@namei.org
@@ -5453,13 +5573,14 @@ STAGING SUBSYSTEM
 P:     Greg Kroah-Hartman
 M:     gregkh@suse.de
 T:     quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/
 P:     Greg Kroah-Hartman
 M:     gregkh@suse.de
 T:     quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/
+L:     devel@driverdev.osuosl.org
 S:     Maintained
 F:     drivers/staging/
 
 STARFIRE/DURALAN NETWORK DRIVER
 P:     Ion Badulescu
 S:     Maintained
 F:     drivers/staging/
 
 STARFIRE/DURALAN NETWORK DRIVER
 P:     Ion Badulescu
-M:     ionut@cs.columbia.edu
-S:     Maintained
+M:     ionut@badula.org
+S:     Odd Fixes
 F:     drivers/net/starfire*
 
 STARMODE RADIO IP (STRIP) PROTOCOL DRIVER
 F:     drivers/net/starfire*
 
 STARMODE RADIO IP (STRIP) PROTOCOL DRIVER
@@ -5593,6 +5714,13 @@ F:       drivers/misc/tifm*
 F:     drivers/mmc/host/tifm_sd.c
 F:     include/linux/tifm.h
 
 F:     drivers/mmc/host/tifm_sd.c
 F:     include/linux/tifm.h
 
+TI TWL4030 SERIES SOC CODEC DRIVER
+P:     Peter Ujfalusi
+M:     peter.ujfalusi@nokia.com
+L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
+S:     Maintained
+F:     sound/soc/codecs/twl4030*
+
 TIPC NETWORK LAYER
 P:     Per Liden
 M:     per.liden@ericsson.com
 TIPC NETWORK LAYER
 P:     Per Liden
 M:     per.liden@ericsson.com
@@ -5676,6 +5804,11 @@ P:       Jiri Kosina
 M:     trivial@kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git
 S:     Maintained
 M:     trivial@kernel.org
 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
 
 TTY LAYER
 P:     Alan Cox
@@ -6088,6 +6221,12 @@ L:       linux-wireless@vger.kernel.org
 S:     Maintained
 F:     drivers/net/wireless/rndis_wlan.c
 
 S:     Maintained
 F:     drivers/net/wireless/rndis_wlan.c
 
+USB XHCI DRIVER
+P:     Sarah Sharp
+M:     sarah.a.sharp@intel.com
+L:     linux-usb@vger.kernel.org
+S:     Supported
+
 USB ZC0301 DRIVER
 P:     Luca Risolia
 M:     luca.risolia@studio.unibo.it
 USB ZC0301 DRIVER
 P:     Luca Risolia
 M:     luca.risolia@studio.unibo.it
@@ -6178,6 +6317,14 @@ S:       Maintained
 F:     Documentation/i2c/busses/i2c-viapro
 F:     drivers/i2c/busses/i2c-viapro.c
 
 F:     Documentation/i2c/busses/i2c-viapro
 F:     drivers/i2c/busses/i2c-viapro.c
 
+VIA SD/MMC CARD CONTROLLER DRIVER
+P:     Joseph Chan
+M:     JosephChan@via.com.tw
+P:     Harald Welte
+M:     HaraldWelte@viatech.com
+S:     Maintained
+F:     drivers/mmc/host/via-sdmmc.c
+
 VIA UNICHROME(PRO)/CHROME9 FRAMEBUFFER DRIVER
 P:     Joseph Chan
 M:     JosephChan@via.com.tw
 VIA UNICHROME(PRO)/CHROME9 FRAMEBUFFER DRIVER
 P:     Joseph Chan
 M:     JosephChan@via.com.tw
Full containers within linux kernel