1 files changed, 108 insertions, 23 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 3c41de95a33d..601ede3b8f17 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -579,6 +579,12 @@ F:	drivers/mtd/nand/bcm_umi_bch.c
 F:      drivers/mtd/nand/bcm_umi_hamming.c
 F:      drivers/mtd/nand/nand_bcm_umi.h
 
+ARM/CAVIUM NETWORKS CNS3XXX MACHINE SUPPORT
+M:      Anton Vorontsov <avorontsov@mvista.com>
+S:      Maintained
+F:      arch/arm/mach-cns3xxx/
+T:      git git://git.infradead.org/users/cbou/linux-cns3xxx.git
+
 ARM/CIRRUS LOGIC EP93XX ARM ARCHITECTURE
 M:      Hartley Sweeten <hsweeten@visionengravers.com>
 M:      Ryan Mallon <ryan@bluewatersys.com>
@@ -768,11 +774,10 @@ M:	Philipp Zabel <philipp.zabel@gmail.com>
 S:      Maintained
 
 ARM/Marvell Loki/Kirkwood/MV78xx0/Orion SOC support
-M:      Lennert Buytenhek <buytenh@marvell.com>
-M:      Nicolas Pitre <nico@marvell.com>
+M:      Lennert Buytenhek <kernel@wantstofly.org>
+M:      Nicolas Pitre <nico@fluxnic.net>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-T:      git git://git.marvell.com/orion
-S:      Maintained
+S:      Odd Fixes
 F:      arch/arm/mach-loki/
 F:      arch/arm/mach-kirkwood/
 F:      arch/arm/mach-mv78xx0/
@@ -807,6 +812,7 @@ ARM/QUALCOMM MSM MACHINE SUPPORT
 M:      David Brown <davidb@codeaurora.org>
 M:      Daniel Walker <dwalker@codeaurora.org>
 M:      Bryan Huntsman <bryanh@codeaurora.org>
+L:      linux-arm-msm@vger.kernel.org
 F:      arch/arm/mach-msm/
 F:      drivers/video/msm/
 F:      drivers/mmc/host/msm_sdcc.c
@@ -987,6 +993,20 @@ W:	http://www.arm.linux.org.uk/
 S:      Maintained
 F:      arch/arm/vfp/
 
+ARM/VOIPAC PXA270 SUPPORT
+M:      Marek Vasut <marek.vasut@gmail.com>
+L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S:      Maintained
+F:      arch/arm/mach-pxa/vpac270.c
+F:      arch/arm/mach-pxa/include/mach-pxa/vpac270.h
+
+ARM/ZIPIT Z2 SUPPORT
+M:      Marek Vasut <marek.vasut@gmail.com>
+L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S:      Maintained
+F:      arch/arm/mach-pxa/z2.c
+F:      arch/arm/mach-pxa/include/mach-pxa/z2.h
+
 ASC7621 HARDWARE MONITOR DRIVER
 M:      George Joseph <george.joseph@fairview5.com>
 L:      lm-sensors@lm-sensors.org
@@ -1494,9 +1514,10 @@ M:	Andy Whitcroft <apw@canonical.com>
 S:      Supported
 F:      scripts/checkpatch.pl
 
-CISCO 10G ETHERNET DRIVER
+CISCO VIC ETHERNET NIC DRIVER
 M:      Scott Feldman <scofeldm@cisco.com>
-M:      Joe Eykholt <jeykholt@cisco.com>
+M:      Vasanthy Kolluri <vkolluri@cisco.com>
+M:      Roopa Prabhu <roprabhu@cisco.com>
 S:      Supported
 F:      drivers/net/enic/
 
@@ -1722,6 +1743,20 @@ W:	http://www.openfabrics.org
 S:      Supported
 F:      drivers/infiniband/hw/cxgb3/
 
+CXGB4 ETHERNET DRIVER (CXGB4)
+M:      Dimitris Michailidis <dm@chelsio.com>
+L:      netdev@vger.kernel.org
+W:      http://www.chelsio.com
+S:      Supported
+F:      drivers/net/cxgb4/
+
+CXGB4 IWARP RNIC DRIVER (IW_CXGB4)
+M:      Steve Wise <swise@chelsio.com>
+L:      linux-rdma@vger.kernel.org
+W:      http://www.openfabrics.org
+S:      Supported
+F:      drivers/infiniband/hw/cxgb4/
+
 CYBERPRO FB DRIVER
 M:      Russell King <linux@arm.linux.org.uk>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -2660,16 +2695,12 @@ F:	Documentation/timers/hpet.txt
 F:      drivers/char/hpet.c
 F:      include/linux/hpet.h
 
-HPET:   i386
-M:      "Venkatesh Pallipadi (Venki)" <venkatesh.pallipadi@intel.com>
+HPET:   x86
+M:      "Venkatesh Pallipadi (Venki)" <venki@google.com>
 S:      Maintained
 F:      arch/x86/kernel/hpet.c
 F:      arch/x86/include/asm/hpet.h
 
-HPET:   x86_64
-M:      Vojtech Pavlik <vojtech@suse.cz>
-S:      Maintained
-
 HPET:   ACPI
 M:      Bob Picco <bob.picco@hp.com>
 S:      Maintained
@@ -2710,6 +2741,7 @@ M:	"Ben Dooks (embedded platforms)" <ben-linux@fluff.org>
 L:      linux-i2c@vger.kernel.org
 W:      http://i2c.wiki.kernel.org/
 T:      quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-i2c/
+T:      git git://git.fluff.org/bjdooks/linux.git
 S:      Maintained
 F:      Documentation/i2c/
 F:      drivers/i2c/
@@ -2946,6 +2978,17 @@ S:	Odd Fixes
 F:      Documentation/networking/README.ipw2200
 F:      drivers/net/wireless/ipw2x00/ipw2200.*
 
+INTEL(R) TRUSTED EXECUTION TECHNOLOGY (TXT)
+M:      Joseph Cihula <joseph.cihula@intel.com>
+M:      Shane Wang <shane.wang@intel.com>
+L:      tboot-devel@lists.sourceforge.net
+W:      http://tboot.sourceforge.net
+T:      Mercurial http://www.bughost.org/repos.hg/tboot.hg
+S:      Supported
+F:      Documentation/intel_txt.txt
+F:      include/linux/tboot.h
+F:      arch/x86/kernel/tboot.c
+
 INTEL WIRELESS WIMAX CONNECTION 2400
 M:      Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>
 M:      linux-wimax@intel.com
@@ -2995,10 +3038,9 @@ F:	net/ipv4/netfilter/ipt_MASQUERADE.c
 IP1000A 10/100/1000 GIGABIT ETHERNET DRIVER
 M:      Francois Romieu <romieu@fr.zoreil.com>
 M:      Sorbica Shieh <sorbica@icplus.com.tw>
-M:      Jesse Huang <jesse@icplus.com.tw>
 L:      netdev@vger.kernel.org
 S:      Maintained
-F:      drivers/net/ipg.c
+F:      drivers/net/ipg.*
 
 IPATH DRIVER
 M:      Ralph Campbell <infinipath@qlogic.com>
@@ -3617,7 +3659,8 @@ F:	drivers/net/wireless/mwl8k.c
 
 MARVELL SOC MMC/SD/SDIO CONTROLLER DRIVER
 M:      Nicolas Pitre <nico@fluxnic.net>
-S:      Maintained
+S:      Odd Fixes
+F: drivers/mmc/host/mvsdio.*
 
 MARVELL YUKON / SYSKONNECT DRIVER
 M:      Mirko Lindner <mlindner@syskonnect.de>
@@ -3845,7 +3888,6 @@ M:	Ramkrishna Vepa <ram.vepa@neterion.com>
 M:      Rastapur Santosh <santosh.rastapur@neterion.com>
 M:      Sivakumar Subramani <sivakumar.subramani@neterion.com>
 M:      Sreenivasa Honnur <sreenivasa.honnur@neterion.com>
-M:      Anil Murthy <anil.murthy@neterion.com>
 L:      netdev@vger.kernel.org
 W:      http://trac.neterion.com/cgi-bin/trac.cgi/wiki/Linux?Anonymous
 W:      http://trac.neterion.com/cgi-bin/trac.cgi/wiki/X3100Linux?Anonymous
@@ -3950,6 +3992,7 @@ F:	net/rfkill/
 F:      net/wireless/
 F:      include/net/ieee80211*
 F:      include/linux/wireless.h
+F:      include/linux/iw_handler.h
 F:      drivers/net/wireless/
 
 NETWORKING DRIVERS
@@ -4158,6 +4201,7 @@ OPROFILE
 M:      Robert Richter <robert.richter@amd.com>
 L:      oprofile-list@lists.sf.net
 S:      Maintained
+F:      arch/*/include/asm/oprofile*.h
 F:      arch/*/oprofile/
 F:      drivers/oprofile/
 F:      include/linux/oprofile.h
@@ -4346,13 +4390,13 @@ M:	Paul Mackerras <paulus@samba.org>
 M:      Ingo Molnar <mingo@elte.hu>
 M:      Arnaldo Carvalho de Melo <acme@redhat.com>
 S:      Supported
-F:      kernel/perf_event.c
+F:      kernel/perf_event*.c
 F:      include/linux/perf_event.h
-F:      arch/*/kernel/perf_event.c
-F:      arch/*/kernel/*/perf_event.c
-F:      arch/*/kernel/*/*/perf_event.c
+F:      arch/*/kernel/perf_event*.c
+F:      arch/*/kernel/*/perf_event*.c
+F:      arch/*/kernel/*/*/perf_event*.c
 F:      arch/*/include/asm/perf_event.h
-F:      arch/*/lib/perf_event.c
+F:      arch/*/lib/perf_event*.c
 F:      arch/*/kernel/perf_callchain.c
 F:      tools/perf/
 
@@ -4588,6 +4632,7 @@ F:	drivers/net/qla3xxx.*
 
 QLOGIC QLCNIC (1/10)Gb ETHERNET DRIVER
 M:      Amit Kumar Salecha <amit.salecha@qlogic.com>
+M:      Anirban Chakraborty <anirban.chakraborty@qlogic.com>
 M:      linux-driver@qlogic.com
 L:      netdev@vger.kernel.org
 S:      Supported
@@ -5122,7 +5167,7 @@ F:	mm/sl?b.c
 
 SMC91x ETHERNET DRIVER
 M:      Nicolas Pitre <nico@fluxnic.net>
-S:      Maintained
+S:      Odd Fixes
 F:      drivers/net/smc91x.*
 
 SMSC47B397 HARDWARE MONITOR DRIVER
@@ -5253,6 +5298,46 @@ F:	drivers/serial/sunsu.c
 F:      drivers/serial/sunzilog.c
 F:      drivers/serial/sunzilog.h
 
+SPEAR PLATFORM SUPPORT
+M:      Viresh Kumar <viresh.kumar@st.com>
+W:      http://www.st.com/spear
+S:      Maintained
+F:      arch/arm/plat-spear/
+
+SPEAR3XX MACHINE SUPPORT
+M:      Viresh Kumar <viresh.kumar@st.com>
+W:      http://www.st.com/spear
+S:      Maintained
+F:      arch/arm/mach-spear3xx/
+
+SPEAR6XX MACHINE SUPPORT
+M:      Rajeev Kumar <rajeev-dlh.kumar@st.com>
+W:      http://www.st.com/spear
+S:      Maintained
+F:      arch/arm/mach-spear6xx/
+
+SPEAR CLOCK FRAMEWORK SUPPORT
+M:      Viresh Kumar <viresh.kumar@st.com>
+W:      http://www.st.com/spear
+S:      Maintained
+F:      arch/arm/mach-spear*/clock.c
+F:      arch/arm/mach-spear*/include/mach/clkdev.h
+F:      arch/arm/plat-spear/clock.c
+F:      arch/arm/plat-spear/include/plat/clock.h and clkdev.h
+
+SPEAR PAD MULTIPLEXING SUPPORT
+M:      Viresh Kumar <viresh.kumar@st.com>
+W:      http://www.st.com/spear
+S:      Maintained
+F:      arch/arm/plat-spear/include/plat/padmux.h
+F:      arch/arm/plat-spear/padmux.c
+F:      arch/arm/mach-spear*/spear*xx.c
+F:      arch/arm/mach-spear*/include/mach/generic.h
+F:      arch/arm/mach-spear3xx/spear3*0.c
+F:      arch/arm/mach-spear3xx/spear3*0_evb.c
+F:      arch/arm/mach-spear6xx/spear600.c
+F:      arch/arm/mach-spear6xx/spear600_evb.c
+
 SPECIALIX IO8+ MULTIPORT SERIAL CARD DRIVER
 M:      Roger Wolff <R.E.Wolff@BitWizard.nl>
 S:      Supported
@@ -5881,7 +5966,7 @@ M:	Laurent Pinchart <laurent.pinchart@skynet.be>
 L:      linux-uvc-devel@lists.berlios.de (subscribers-only)
 L:      linux-media@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
-W:      http://linux-uvc.berlios.de
+W:      http://www.ideasonboard.org/uvc/
 S:      Maintained
 F:      drivers/media/video/uvc/