Merge branch 'master' into next

1 files changed, 212 insertions, 105 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index c450f3abb8c9..4f96ac81089c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -65,43 +65,51 @@ trivial patch so apply some common sense.
 
 8.      Happy hacking.
 
-                -----------------------------------
-
-Maintainers List (try to look for most precise areas first)
+Descriptions of section entries:
+
+        P: Person (obsolete)
+        M: Mail patches to: FullName <address@domain>
+        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, stgit.
+        S: Status, one of the following:
+           Supported:   Someone is actually paid to look after this.
+           Maintained:  Someone actually looks after it.
+           Odd Fixes:   It has a maintainer but they don't have time to do
+                        much other than throw the odd patch in. See below..
+           Orphan:      No current maintainer [but maybe you could take the
+                        role as you write your new code].
+           Obsolete:    Old code. Something tagged obsolete generally means
+                        it has been replaced by a better system and you
+                        should be using that.
+        F: Files and directories with wildcard patterns.
+           A trailing slash includes all files and subdirectory files.
+           F:   drivers/net/    all files in and below drivers/net
+           F:   drivers/net/*   all files in drivers/net, but not below
+           F:   */net/*         all files in "any top level directory"/net
+           One pattern per line.  Multiple F: lines acceptable.
+        X: Files and directories that are NOT maintained, same rules as F:
+           Files exclusions are tested before file matches.
+           Can be useful for excluding a specific subdirectory, for instance:
+           F:   net/
+           X:   net/ipv6/
+           matches all files in and below net excluding net/ipv6/
+        K: Keyword perl extended regex pattern to match content in a
+           patch or file.  For instance:
+           K: of_get_profile
+              matches patches or files that contain "of_get_profile"
+           K: \b(printk|pr_(info|err))\b
+              matches patches or files that contain one or more of the words
+              printk, pr_info or pr_err
+           One regex pattern per line.  Multiple K: lines acceptable.
 
 Note: For the hard of thinking, this list is meant to remain in alphabetical
 order. If you could add yourselves to it in alphabetical order that would be
 so much easier [Ed]
 
-P: Person (obsolete)
-M: Mail patches to: FullName <address@domain>
-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, stgit.
-S: Status, one of the following:
-
-        Supported:      Someone is actually paid to look after this.
-        Maintained:     Someone actually looks after it.
-        Odd Fixes:      It has a maintainer but they don't have time to do
-                        much other than throw the odd patch in. See below..
-        Orphan:         No current maintainer [but maybe you could take the
-                        role as you write your new code].
-        Obsolete:       Old code. Something tagged obsolete generally means
-                        it has been replaced by a better system and you
-                        should be using that.
+Maintainers List (try to look for most precise areas first)
 
-F: Files and directories with wildcard patterns.
-   A trailing slash includes all files and subdirectory files.
-        F:      drivers/net/    all files in and below drivers/net
-        F:      drivers/net/*   all files in drivers/net, but not below
-        F:      */net/*         all files in "any top level directory"/net
-   One pattern per line.  Multiple F: lines acceptable.
-X: Files and directories that are NOT maintained, same rules as F:
-   Files exclusions are tested before file matches.
-   Can be useful for excluding a specific subdirectory, for instance:
-        F:      net/
-        X:      net/ipv6/
-   matches all files in and below net excluding net/ipv6/
+                -----------------------------------
 
 3C505 NETWORK DRIVER
 M:      Philip Blundell <philb@gnu.org>
@@ -174,7 +182,7 @@ M:	Ron Minnich <rminnich@sandia.gov>
 M:      Latchesar Ionkov <lucho@ionkov.net>
 L:      v9fs-developer@lists.sourceforge.net
 W:      http://swik.net/v9fs
-T:      git git://git.kernel.org/pub/scm/linux/kernel/ericvh/v9fs.git
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git
 S:      Maintained
 F:      Documentation/filesystems/9p.txt
 F:      fs/9p/
@@ -257,6 +265,13 @@ W:	http://www.lesswatts.org/projects/acpi/
 S:      Supported
 F:      drivers/acpi/fan.c
 
+ACPI PROCESSOR AGGREGATOR DRIVER
+M:      Shaohua Li <shaohua.li@intel.com>
+L:      linux-acpi@vger.kernel.org
+W:      http://www.lesswatts.org/projects/acpi/
+S:      Supported
+F:      drivers/acpi/acpi_pad.c
+
 ACPI THERMAL DRIVER
 M:      Zhang Rui <rui.zhang@intel.com>
 L:      linux-acpi@vger.kernel.org
@@ -497,10 +512,32 @@ W:	http://www.arm.linux.org.uk/
 S:      Maintained
 F:      arch/arm/
 
+ARM PRIMECELL AACI PL041 DRIVER
+M:      Russell King <linux@arm.linux.org.uk>
+S:      Maintained
+F:      sound/arm/aaci.*
+
+ARM PRIMECELL CLCD PL110 DRIVER
+M:      Russell King <linux@arm.linux.org.uk>
+S:      Maintained
+F:      drivers/video/amba-clcd.*
+
+ARM PRIMECELL KMI PL050 DRIVER
+M:      Russell King <linux@arm.linux.org.uk>
+S:      Maintained
+F:      drivers/input/serio/ambakmi.*
+F:      include/linux/amba/kmi.h
+
 ARM PRIMECELL MMCI PL180/1 DRIVER
 S:      Orphan
 F:      drivers/mmc/host/mmci.*
 
+ARM PRIMECELL BUS SUPPORT
+M:      Russell King <linux@arm.linux.org.uk>
+S:      Maintained
+F:      drivers/amba/
+F:      include/linux/amba/bus.h
+
 ARM/ADI ROADRUNNER MACHINE SUPPORT
 M:      Lennert Buytenhek <kernel@wantstofly.org>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -570,6 +607,11 @@ M:	Mike Rapoport <mike@compulab.co.il>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
 
+ARM/CONTEC MICRO9 MACHINE SUPPORT
+M:      Hubert Feurstein <hubert.feurstein@contec.at>
+S:      Maintained
+F:      arch/arm/mach-ep93xx/micro9.c
+
 ARM/CORGI MACHINE SUPPORT
 M:      Richard Purdie <rpurdie@rpsys.net>
 S:      Maintained
@@ -646,24 +688,24 @@ ARM/INTEL IOP32X ARM ARCHITECTURE
 M:      Lennert Buytenhek <kernel@wantstofly.org>
 M:      Dan Williams <dan.j.williams@intel.com>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-S:      Supported
+S:      Maintained
 
 ARM/INTEL IOP33X ARM ARCHITECTURE
 M:      Dan Williams <dan.j.williams@intel.com>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-S:      Supported
+S:      Maintained
 
 ARM/INTEL IOP13XX ARM ARCHITECTURE
 M:      Lennert Buytenhek <kernel@wantstofly.org>
 M:      Dan Williams <dan.j.williams@intel.com>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-S:      Supported
+S:      Maintained
 
 ARM/INTEL IQ81342EX MACHINE SUPPORT
 M:      Lennert Buytenhek <kernel@wantstofly.org>
 M:      Dan Williams <dan.j.williams@intel.com>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-S:      Supported
+S:      Maintained
 
 ARM/INTEL IXP2000 ARM ARCHITECTURE
 M:      Lennert Buytenhek <kernel@wantstofly.org>
@@ -691,7 +733,7 @@ ARM/INTEL XSC3 (MANZANO) ARM CORE
 M:      Lennert Buytenhek <kernel@wantstofly.org>
 M:      Dan Williams <dan.j.williams@intel.com>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-S:      Supported
+S:      Maintained
 
 ARM/IP FABRICS DOUBLE ESPRESSO MACHINE SUPPORT
 M:      Lennert Buytenhek <kernel@wantstofly.org>
@@ -741,23 +783,36 @@ M:	Dirk Opfer <dirk@opfer-online.de>
 S:      Maintained
 
 ARM/PALMTX,PALMT5,PALMLD,PALMTE2,PALMTC SUPPORT
-P:      Marek Vasut
-M:      marek.vasut@gmail.com
+M:      Marek Vasut <marek.vasut@gmail.com>
 L:      linux-arm-kernel@lists.infradead.org
 W:      http://hackndev.com
 S:      Maintained
+F:      arch/arm/mach-pxa/include/mach/palmtx.h
+F:      arch/arm/mach-pxa/palmtx.c
+F:      arch/arm/mach-pxa/include/mach/palmt5.h
+F:      arch/arm/mach-pxa/palmt5.c
+F:      arch/arm/mach-pxa/include/mach/palmld.h
+F:      arch/arm/mach-pxa/palmld.c
+F:      arch/arm/mach-pxa/include/mach/palmte2.h
+F:      arch/arm/mach-pxa/palmte2.c
+F:      arch/arm/mach-pxa/include/mach/palmtc.h
+F:      arch/arm/mach-pxa/palmtc.c
 
 ARM/PALM TREO 680 SUPPORT
 M:      Tomas Cech <sleep_walker@suse.cz>
 L:      linux-arm-kernel@lists.infradead.org
 W:      http://hackndev.com
 S:      Maintained
+F:      arch/arm/mach-pxa/include/mach/treo680.h
+F:      arch/arm/mach-pxa/treo680.c
 
 ARM/PALMZ72 SUPPORT
 M:      Sergey Lapin <slapin@ossfans.org>
 L:      linux-arm-kernel@lists.infradead.org
 W:      http://hackndev.com
 S:      Maintained
+F:      arch/arm/mach-pxa/include/mach/palmz72.h
+F:      arch/arm/mach-pxa/palmz72.c
 
 ARM/PLEB SUPPORT
 M:      Peter Chubb <pleb@gelato.unsw.edu.au>
@@ -873,7 +928,6 @@ M:	Karol Kozimor <sziwan@users.sourceforge.net>
 L:      acpi4asus-user@lists.sourceforge.net
 W:      http://acpi4asus.sf.net
 S:      Maintained
-F:      arch/x86/kernel/acpi/boot.c
 F:      drivers/platform/x86/asus_acpi.c
 
 ASUS ASB100 HARDWARE MONITOR DRIVER
@@ -967,7 +1021,7 @@ F:	drivers/net/atlx/
 
 ATM
 M:      Chas Williams <chas@cmf.nrl.navy.mil>
-L:      linux-atm-general@lists.sourceforge.net (subscribers-only)
+L:      linux-atm-general@lists.sourceforge.net (moderated for non-subscribers)
 L:      netdev@vger.kernel.org
 W:      http://linux-atm.sourceforge.net
 S:      Maintained
@@ -995,7 +1049,7 @@ F:	drivers/serial/atmel_serial.c
 
 ATMEL LCDFB DRIVER
 M:      Nicolas Ferre <nicolas.ferre@atmel.com>
-L:      linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
+L:      linux-fbdev@vger.kernel.org
 S:      Maintained
 F:      drivers/video/atmel_lcdfb.c
 F:      include/video/atmel_lcdc.h
@@ -1211,6 +1265,12 @@ L:	netdev@vger.kernel.org
 S:      Supported
 F:      drivers/net/tg3.*
 
+BROCADE BFA FC SCSI DRIVER
+M:      Jing Huang <huangj@brocade.com>
+L:      linux-scsi@vger.kernel.org
+S:      Supported
+F:      drivers/scsi/bfa/
+
 BSG (block layer generic sg v4 driver)
 M:      FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
 L:      linux-scsi@vger.kernel.org
@@ -1448,6 +1508,7 @@ F:	mm/*cgroup*
 
 CORETEMP HARDWARE MONITORING DRIVER
 M:      Rudolf Marek <r.marek@assembler.cz>
+M:      Huaxu Wan <huaxu.wan@intel.com>
 L:      lm-sensors@lm-sensors.org
 S:      Maintained
 F:      Documentation/hwmon/coretemp
@@ -2038,7 +2099,7 @@ S:	Maintained
 F:      fs/*
 
 FINTEK F75375S HARDWARE MONITOR AND FAN CONTROLLER DRIVER
-M:      Riku Voipio <riku.vipio@iki.fi>
+M:      Riku Voipio <riku.voipio@iki.fi>
 L:      lm-sensors@lm-sensors.org
 S:      Maintained
 F:      drivers/hwmon/f75375s.c
@@ -2074,7 +2135,7 @@ F:	drivers/net/wan/dlci.c
 F:      drivers/net/wan/sdla.c
 
 FRAMEBUFFER LAYER
-L:      linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
+L:      linux-fbdev@vger.kernel.org
 W:      http://linux-fbdev.sourceforge.net/
 S:      Orphan
 F:      Documentation/fb/
@@ -2097,7 +2158,7 @@ F:	drivers/i2c/busses/i2c-cpm.c
 
 FREESCALE IMX / MXC FRAMEBUFFER DRIVER
 M:      Sascha Hauer <kernel@pengutronix.de>
-L:      linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
+L:      linux-fbdev@vger.kernel.org
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
 F:      arch/arm/plat-mxc/include/mach/imxfb.h
@@ -2119,7 +2180,7 @@ S:	Supported
 F:      arch/powerpc/sysdev/qe_lib/
 F:      arch/powerpc/include/asm/*qe.h
 
-FREESCALE USB PERIPHERIAL DRIVERS
+FREESCALE USB PERIPHERAL DRIVERS
 M:      Li Yang <leoli@freescale.com>
 L:      linux-usb@vger.kernel.org
 L:      linuxppc-dev@ozlabs.org
@@ -2170,18 +2231,6 @@ F:	Documentation/filesystems/caching/
 F:      fs/fscache/
 F:      include/linux/fscache*.h
 
-TRACING
-M:      Steven Rostedt <rostedt@goodmis.org>
-M:      Frederic Weisbecker <fweisbec@gmail.com>
-M:      Ingo Molnar <mingo@redhat.com>
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git tracing/core
-S:      Maintained
-F:      Documentation/trace/ftrace.txt
-F:      arch/*/*/*/ftrace.h
-F:      arch/*/kernel/ftrace.c
-F:      include/*/ftrace.h include/trace/ include/linux/trace*.h
-F:      kernel/trace/
-
 FUJITSU FR-V (FRV) PORT
 M:      David Howells <dhowells@redhat.com>
 S:      Maintained
@@ -2240,9 +2289,8 @@ S:	Maintained
 F:      include/asm-generic
 
 GENERIC UIO DRIVER FOR PCI DEVICES
-M:      Michael S. Tsirkin <mst@redhat.com>
+M:      "Michael S. Tsirkin" <mst@redhat.com>
 L:      kvm@vger.kernel.org
-L:      linux-kernel@vger.kernel.org
 S:      Supported
 F:      drivers/uio/uio_pci_generic.c
 
@@ -2286,6 +2334,13 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 S:      Maintained
 F:      drivers/media/video/gspca/finepix.c
 
+GSPCA GL860 SUBDRIVER
+M:      Olivier Lorin <o.lorin@laposte.net>
+L:      linux-media@vger.kernel.org
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
+S:      Maintained
+F:      drivers/media/video/gspca/gl860/
+
 GSPCA M5602 SUBDRIVER
 M:      Erik Andren <erik.andren@gmail.com>
 L:      linux-media@vger.kernel.org
@@ -2507,8 +2562,7 @@ S:	Maintained
 F:      Documentation/i2c/
 F:      drivers/i2c/
 F:      include/linux/i2c.h
-F:      include/linux/i2c-dev.h
-F:      include/linux/i2c-id.h
+F:      include/linux/i2c-*.h
 
 I2C-TINY-USB DRIVER
 M:      Till Harbaum <till@harbaum.org>
@@ -2583,6 +2637,7 @@ L:	linux1394-devel@lists.sourceforge.net
 W:      http://www.linux1394.org/
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git
 S:      Maintained
+F:      Documentation/debugging-via-ohci1394.txt
 F:      drivers/ieee1394/
 
 IEEE 1394 RAW I/O DRIVER
@@ -2608,7 +2663,7 @@ S:	Supported
 F:      security/integrity/ima/
 
 IMS TWINTURBO FRAMEBUFFER DRIVER
-L:      linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
+L:      linux-fbdev@vger.kernel.org
 S:      Orphan
 F:      drivers/video/imsttfb.c
 
@@ -2643,14 +2698,14 @@ F:	drivers/input/
 
 INTEL FRAMEBUFFER DRIVER (excluding 810 and 815)
 M:      Sylvain Meyer <sylvain.meyer@worldonline.fr>
-L:      linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
+L:      linux-fbdev@vger.kernel.org
 S:      Maintained
 F:      Documentation/fb/intelfb.txt
 F:      drivers/video/intelfb/
 
 INTEL 810/815 FRAMEBUFFER DRIVER
 M:      Antonino Daplas <adaplas@gmail.com>
-L:      linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
+L:      linux-fbdev@vger.kernel.org
 S:      Maintained
 F:      drivers/video/i810/
 
@@ -2682,7 +2737,7 @@ F:	include/linux/intel-iommu.h
 
 INTEL IOP-ADMA DMA DRIVER
 M:      Dan Williams <dan.j.williams@intel.com>
-S:      Supported
+S:      Maintained
 F:      drivers/dma/iop-adma.c
 
 INTEL IXP4XX QMGR, NPE, ETHERNET and HSS SUPPORT
@@ -2796,7 +2851,7 @@ F:	drivers/infiniband/hw/ipath/
 
 IPMI SUBSYSTEM
 M:      Corey Minyard <minyard@acm.org>
-L:      openipmi-developer@lists.sourceforge.net
+L:      openipmi-developer@lists.sourceforge.net (moderated for non-subscribers)
 W:      http://openipmi.sourceforge.net/
 S:      Supported
 F:      Documentation/IPMI.txt
@@ -2960,19 +3015,16 @@ S:	Maintained
 F:      fs/autofs4/
 
 KERNEL BUILD
-M:      Sam Ravnborg <sam@ravnborg.org>
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next.git
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes.git
 L:      linux-kbuild@vger.kernel.org
-S:      Maintained
+S:      Orphan
 F:      Documentation/kbuild/
 F:      Makefile
 F:      scripts/Makefile.*
 
 KERNEL JANITORS
 L:      kernel-janitors@vger.kernel.org
-W:      http://www.kerneljanitors.org/
-S:      Maintained
+W:      http://janitor.kernelnewbies.org/
+S:      Odd Fixes
 
 KERNEL NFSD, SUNRPC, AND LOCKD SERVERS
 M:      "J. Bruce Fields" <bfields@fieldses.org>
@@ -3057,9 +3109,13 @@ F:	kernel/kgdb.c
 
 KMEMCHECK
 M:      Vegard Nossum <vegardno@ifi.uio.no>
-P       Pekka Enberg
-M:      penberg@cs.helsinki.fi
+M:      Pekka Enberg <penberg@cs.helsinki.fi>
 S:      Maintained
+F:      Documentation/kmemcheck.txt
+F:      arch/x86/include/asm/kmemcheck.h
+F:      arch/x86/mm/kmemcheck/
+F:      include/linux/kmemcheck.h
+F:      mm/kmemcheck.c
 
 KMEMLEAK
 M:      Catalin Marinas <catalin.marinas@arm.com>
@@ -3360,7 +3416,7 @@ S:	Supported
 
 MATROX FRAMEBUFFER DRIVER
 M:      Petr Vandrovec <vandrove@vc.cvut.cz>
-L:      linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
+L:      linux-fbdev@vger.kernel.org
 S:      Maintained
 F:      drivers/video/matrox/matroxfb_*
 F:      include/linux/matroxfb.h
@@ -3589,7 +3645,7 @@ L:	netfilter@vger.kernel.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
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6.git
 S:      Supported
 F:      include/linux/netfilter*
 F:      include/linux/netfilter/
@@ -3623,11 +3679,20 @@ F:	Documentation/blockdev/nbd.txt
 F:      drivers/block/nbd.c
 F:      include/linux/nbd.h
 
+NETWORK DROP MONITOR
+M:      Neil Horman <nhorman@tuxdriver.com>
+L:      netdev@vger.kernel.org
+S:      Maintained
+W:      https://fedorahosted.org/dropwatch/
+F:      net/core/drop_monitor.c
+
 NETWORKING [GENERAL]
 M:      "David S. Miller" <davem@davemloft.net>
 L:      netdev@vger.kernel.org
 W:      http://www.linuxfoundation.org/en/Net
+W:      http://patchwork.ozlabs.org/project/netdev/list/
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6.git
 S:      Maintained
 F:      net/
 F:      include/net/
@@ -3738,13 +3803,13 @@ F:	fs/ntfs/
 
 NVIDIA (rivafb and nvidiafb) FRAMEBUFFER DRIVER
 M:      Antonino Daplas <adaplas@gmail.com>
-L:      linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
+L:      linux-fbdev@vger.kernel.org
 S:      Maintained
 F:      drivers/video/riva/
 F:      drivers/video/nvidia/
 
 OMAP SUPPORT
-M:      "Tony Lindgren <tony@atomide.com>" <tony@atomide.com>
+M:      Tony Lindgren <tony@atomide.com>
 L:      linux-omap@vger.kernel.org
 W:      http://www.muru.com/linux/omap/
 W:      http://linux.omap.com/
@@ -3773,7 +3838,7 @@ F:	sound/soc/omap/
 
 OMAP FRAMEBUFFER SUPPORT
 M:      Imre Deak <imre.deak@nokia.com>
-L:      linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
+L:      linux-fbdev@vger.kernel.org
 L:      linux-omap@vger.kernel.org
 S:      Maintained
 F:      drivers/video/omap/
@@ -3849,6 +3914,15 @@ S:	Maintained
 F:      Documentation/i2c/busses/i2c-ocores
 F:      drivers/i2c/busses/i2c-ocores.c
 
+OPEN FIRMWARE AND FLATTENED DEVICE TREE
+M:      Grant Likely <grant.likely@secretlab.ca>
+L:      devicetree-discuss@lists.ozlabs.org
+W:      http://fdt.secretlab.ca
+S:      Maintained
+F:      drivers/of
+F:      include/linux/of*.h
+K:      of_get_property
+
 OPROFILE
 M:      Robert Richter <robert.richter@amd.com>
 L:      oprofile-list@lists.sf.net
@@ -3953,6 +4027,7 @@ F:	drivers/block/paride/
 PARISC ARCHITECTURE
 M:      Kyle McMartin <kyle@mcmartin.ca>
 M:      Helge Deller <deller@gmx.de>
+M:      "James E.J. Bottomley" <jejb@parisc-linux.org>
 L:      linux-parisc@vger.kernel.org
 W:      http://www.parisc-linux.org/
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6.git
@@ -4036,6 +4111,13 @@ M:	Peter Zijlstra <a.p.zijlstra@chello.nl>
 M:      Paul Mackerras <paulus@samba.org>
 M:      Ingo Molnar <mingo@elte.hu>
 S:      Supported
+F:      kernel/perf_event.c
+F:      include/linux/perf_event.h
+F:      arch/*/*/kernel/perf_event.c
+F:      arch/*/include/asm/perf_event.h
+F:      arch/*/lib/perf_event.c
+F:      arch/*/kernel/perf_callchain.c
+F:      tools/perf/
 
 PERSONALITY HANDLING
 M:      Christoph Hellwig <hch@infradead.org>
@@ -4262,21 +4344,23 @@ F:	include/linux/qnxtypes.h
 
 RADEON FRAMEBUFFER DISPLAY DRIVER
 M:      Benjamin Herrenschmidt <benh@kernel.crashing.org>
-L:      linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
+L:      linux-fbdev@vger.kernel.org
 S:      Maintained
 F:      drivers/video/aty/radeon*
 F:      include/linux/radeonfb.h
 
 RAGE128 FRAMEBUFFER DISPLAY DRIVER
 M:      Paul Mackerras <paulus@samba.org>
-L:      linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
+L:      linux-fbdev@vger.kernel.org
 S:      Maintained
 F:      drivers/video/aty/aty128fb.c
 
 RALINK RT2X00 WIRELESS LAN DRIVER
 P:      rt2x00 project
+M:      Ivo van Doorn <IvDoorn@gmail.com>
+M:      Gertjan van Wingerde <gwingerde@gmail.com>
 L:      linux-wireless@vger.kernel.org
-L:      users@rt2x00.serialmonkey.com
+L:      users@rt2x00.serialmonkey.com (moderated for non-subscribers)
 W:      http://rt2x00.serialmonkey.com/
 S:      Maintained
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/ivd/rt2x00.git
@@ -4362,7 +4446,7 @@ RFKILL
 M:      Johannes Berg <johannes@sipsolutions.net>
 L:      linux-wireless@vger.kernel.org
 S:      Maintained
-F       Documentation/rfkill.txt
+F:      Documentation/rfkill.txt
 F:      net/rfkill/
 
 RISCOM8 DRIVER
@@ -4406,7 +4490,7 @@ F:	drivers/net/wireless/rtl818x/rtl8187*
 
 S3 SAVAGE FRAMEBUFFER DRIVER
 M:      Antonino Daplas <adaplas@gmail.com>
-L:      linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
+L:      linux-fbdev@vger.kernel.org
 S:      Maintained
 F:      drivers/video/savage/
 
@@ -4485,12 +4569,11 @@ F:	kernel/sched*
 F:      include/linux/sched.h
 
 SCORE ARCHITECTURE
-P:      Chen Liqin
-M:      liqin.chen@sunplusct.com
-P:      Lennox Wu
-M:      lennox.wu@gmail.com
+M:      Chen Liqin <liqin.chen@sunplusct.com>
+M:      Lennox Wu <lennox.wu@gmail.com>
 W:      http://www.sunplusct.com
 S:      Supported
+F:      arch/score/
 
 SCSI CDROM DRIVER
 M:      Jens Axboe <axboe@kernel.dk>
@@ -4563,27 +4646,27 @@ S:	Maintained
 F:      drivers/mmc/host/sdricoh_cs.c
 
 SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) DRIVER
-S:     Orphan
-L:     linux-mmc@vger.kernel.org
-F:     drivers/mmc/host/sdhci.*
+S:      Orphan
+L:      linux-mmc@vger.kernel.org
+F:      drivers/mmc/host/sdhci.*
 
 SECURE DIGITAL HOST CONTROLLER INTERFACE, OPEN FIRMWARE BINDINGS (SDHCI-OF)
 M:      Anton Vorontsov <avorontsov@ru.mvista.com>
 L:      linuxppc-dev@ozlabs.org
-L:     linux-mmc@vger.kernel.org
+L:      linux-mmc@vger.kernel.org
 S:      Maintained
-F:     drivers/mmc/host/sdhci-of.*
+F:      drivers/mmc/host/sdhci-of.*
 
 SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) SAMSUNG DRIVER
 M:      Ben Dooks <ben-linux@fluff.org>
-L:     linux-mmc@vger.kernel.org
+L:      linux-mmc@vger.kernel.org
 S:      Maintained
 F:      drivers/mmc/host/sdhci-s3c.c
 
 SECURITY SUBSYSTEM
 M:      James Morris <jmorris@namei.org>
 L:      linux-security-module@vger.kernel.org (suggested Cc:)
-T:      git git://www.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git
 W:      http://security.wiki.kernel.org/
 S:      Supported
 F:      security/
@@ -4618,6 +4701,13 @@ F:	drivers/ata/
 F:      include/linux/ata.h
 F:      include/linux/libata.h
 
+SERVER ENGINES 10Gbps iSCSI - BladeEngine 2 DRIVER
+M:      Jayamohan Kallickal <jayamohank@serverengines.com>
+L:      linux-scsi@vger.kernel.org
+W:      http://www.serverengines.com
+S:      Supported
+F:      drivers/scsi/be2iscsi/
+
 SERVER ENGINES 10Gbps NIC - BladeEngine 2 DRIVER
 M:      Sathya Perla <sathyap@serverengines.com>
 M:      Subbu Seetharaman <subbus@serverengines.com>
@@ -4671,8 +4761,7 @@ F:	drivers/usb/gadget/lh7a40*
 F:      drivers/usb/host/ohci-lh7a40*
 
 SIMPLE FIRMWARE INTERFACE (SFI)
-P:      Len Brown
-M:      lenb@kernel.org
+M:      Len Brown <lenb@kernel.org>
 L:      sfi-devel@simplefirmware.org
 W:      http://simplefirmware.org/
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6.git
@@ -5120,6 +5209,20 @@ L:	tpmdd-devel@lists.sourceforge.net (moderated for non-subscribers)
 S:      Maintained
 F:      drivers/char/tpm/
 
+TRACING
+M:      Steven Rostedt <rostedt@goodmis.org>
+M:      Frederic Weisbecker <fweisbec@gmail.com>
+M:      Ingo Molnar <mingo@redhat.com>
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git tracing/core
+S:      Maintained
+F:      Documentation/trace/ftrace.txt
+F:      arch/*/*/*/ftrace.h
+F:      arch/*/kernel/ftrace.c
+F:      include/*/ftrace.h
+F:      include/linux/trace*.h
+F:      include/trace/
+F:      kernel/trace/
+
 TRIVIAL PATCHES
 M:      Jiri Kosina <trivial@kernel.org>
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git
@@ -5550,7 +5653,7 @@ S:	Maintained
 
 UVESAFB DRIVER
 M:      Michal Januszewski <spock@gentoo.org>
-L:      linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
+L:      linux-fbdev@vger.kernel.org
 W:      http://dev.gentoo.org/~spock/projects/uvesafb/
 S:      Maintained
 F:      Documentation/fb/uvesafb.txt
@@ -5583,7 +5686,7 @@ F:	drivers/mmc/host/via-sdmmc.c
 VIA UNICHROME(PRO)/CHROME9 FRAMEBUFFER DRIVER
 M:      Joseph Chan <JosephChan@via.com.tw>
 M:      Scott Fang <ScottFang@viatech.com.cn>
-L:      linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
+L:      linux-fbdev@vger.kernel.org
 S:      Maintained
 F:      drivers/video/via/
 
@@ -5608,6 +5711,13 @@ S:	Maintained
 F:      drivers/vlynq/vlynq.c
 F:      include/linux/vlynq.h
 
+VMWARE VMXNET3 ETHERNET DRIVER
+M:      Shreyas Bhatewara <sbhatewara@vmware.com>
+M:      "VMware, Inc." <pv-drivers@vmware.com>
+L:      netdev@vger.kernel.org
+S:      Maintained
+F:      drivers/net/vmxnet3/
+
 VOLTAGE AND CURRENT REGULATOR FRAMEWORK
 M:      Liam Girdwood <lrg@slimlogic.co.uk>
 M:      Mark Brown <broonie@opensource.wolfsonmicro.com>
@@ -5679,8 +5789,7 @@ S:	Maintained
 F:      drivers/scsi/wd7000.c
 
 WINBOND CIR DRIVER
-P:      David Härdeman
-M:      david@hardeman.nu
+M:      David Härdeman <david@hardeman.nu>
 S:      Maintained
 F:      drivers/input/misc/winbond-cir.c
 
@@ -5737,9 +5846,7 @@ F:	drivers/input/touchscreen/*wm97*
 F:      include/linux/wm97xx.h
 
 WOLFSON MICROELECTRONICS PMIC DRIVERS
-P:      Mark Brown
-M:      broonie@opensource.wolfsonmicro.com
-L:      linux-kernel@vger.kernel.org
+M:      Mark Brown <broonie@opensource.wolfsonmicro.com>
 T:      git git://opensource.wolfsonmicro.com/linux-2.6-audioplus
 W:      http://opensource.wolfsonmicro.com/node/8
 S:      Supported