1 files changed, 65 insertions, 12 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 7e6a17e1de09..c42a567e010c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -779,6 +779,7 @@ ATM
 P:      Chas Williams
 M:      chas@cmf.nrl.navy.mil
 L:      linux-atm-general@lists.sourceforge.net (subscribers-only)
+L:      netdev@vger.kernel.org
 W:      http://linux-atm.sourceforge.net
 S:      Maintained
 
@@ -1526,10 +1527,10 @@ W:	http://ebtables.sourceforge.net/
 S:      Maintained
 
 ECRYPT FILE SYSTEM
-P:      Mike Halcrow, Phillip Hellewell
-M:      mhalcrow@us.ibm.com, phillip@hellewell.homeip.net
-L:      ecryptfs-devel@lists.sourceforge.net
-W:      http://ecryptfs.sourceforge.net/
+P:      Tyler Hicks, Dustin Kirkland
+M:      tyhicks@linux.vnet.ibm.com, kirkland@canonical.com
+L:      ecryptfs-devel@lists.launchpad.net
+W:      https://launchpad.net/ecryptfs
 S:      Supported
 
 EDAC-CORE
@@ -1809,7 +1810,7 @@ S:	Maintained
 
 FTRACE
 P:      Steven Rostedt
-M:      srostedt@redhat.com
+M:      rostedt@goodmis.org
 S:      Maintained
 
 FUJITSU FR-V (FRV) PORT
@@ -1879,6 +1880,37 @@ M:	linux-kernel@vger.kernel.org
 W:      http://www.kernel.org/pub/linux/kernel/people/rml/hdaps/
 S:      Maintained
 
+GSPCA FINEPIX SUBDRIVER
+P:      Frank Zago
+M:      frank@zago.net
+L:      video4linux-list@redhat.com
+S:      Maintained
+
+GSPCA M5602 SUBDRIVER
+P:      Erik Andren
+M:      erik.andren@gmail.com
+L:      video4linux-list@redhat.com
+S:      Maintained
+
+GSPCA PAC207 SONIXB SUBDRIVER
+P:      Hans de Goede
+M:      hdegoede@redhat.com
+L:      video4linux-list@redhat.com
+S:      Maintained
+
+GSPCA T613 SUBDRIVER
+P:      Leandro Costantino
+M:      lcostantino@gmail.com
+L:      video4linux-list@redhat.com
+S:      Maintained
+
+GSPCA USB WEBCAM DRIVER
+P:      Jean-Francois Moine
+M:      moinejf@free.fr
+W:      http://moinejf.free.fr
+L:      video4linux-list@redhat.com
+S:      Maintained
+
 HARDWARE MONITORING
 L:      lm-sensors@lm-sensors.org
 W:      http://www.lm-sensors.org/
@@ -2159,9 +2191,9 @@ S:	Supported
 
 INOTIFY
 P:      John McCutchan
-M:      ttb@tentacle.dhs.org
+M:      john@johnmccutchan.com
 P:      Robert Love
-M:      rml@novell.com
+M:      rlove@rlove.org
 L:      linux-kernel@vger.kernel.org
 S:      Maintained
 
@@ -2185,6 +2217,13 @@ M:	adaplas@gmail.com
 L:      linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
 S:      Maintained
 
+INTEL MENLOW THERMAL DRIVER
+P:      Sujith Thomas
+M:      sujith.thomas@intel.com
+L:      linux-acpi@vger.kernel.org
+W:      http://www.lesswatts.org/projects/acpi/
+S:      Supported
+
 INTEL IA32 MICROCODE UPDATE SUPPORT
 P:      Tigran Aivazian
 M:      tigran@aivazian.fsnet.co.uk
@@ -2665,6 +2704,11 @@ P:	Arnaldo Carvalho de Melo
 M:      acme@ghostprotocols.net
 S:      Maintained
 
+LIS3LV02D ACCELEROMETER DRIVER
+P:      Eric Piel
+M:      eric.piel@tremplin-utc.net
+S:      Maintained
+
 LM83 HARDWARE MONITOR DRIVER
 P:      Jean Delvare
 M:      khali@linux-fr.org
@@ -3346,7 +3390,9 @@ S:	Maintained
 
 PNP SUPPORT
 P:      Adam Belay
-M:      ambx1@neo.rr.com
+M:      abelay@mit.edu
+P:      Bjorn Helgaas
+M:      bjorn.helgaas@hp.com
 S:      Maintained
 
 PNXxxxx I2C DRIVER
@@ -3713,6 +3759,15 @@ M:	drzeus-sdhci@drzeus.cx
 L:      sdhci-devel@list.drzeus.cx
 S:      Maintained
 
+SECURITY SUBSYSTEM
+F:      security/
+P:      James Morris
+M:      jmorris@namei.org
+L:      linux-kernel@vger.kernel.org
+L:      linux-security-module@vger.kernel.org (suggested Cc:)
+T:      git kernel.org:pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git
+S:      Supported
+
 SECURITY CONTACT
 P:      Security Officers
 M:      security@kernel.org
@@ -3883,8 +3938,6 @@ M:	bootc@bootc.net
 S:      Maintained
 
 SOFTWARE RAID (Multiple Disks) SUPPORT
-P:      Ingo Molnar
-M:      mingo@redhat.com
 P:      Neil Brown
 M:      neilb@suse.de
 L:      linux-raid@vger.kernel.org
@@ -4192,7 +4245,7 @@ M:	dedekind@infradead.org
 P:      Adrian Hunter
 M:      ext-adrian.hunter@nokia.com
 L:      linux-mtd@lists.infradead.org
-T:      git git://git.infradead.org/~dedekind/ubifs-2.6.git
+T:      git git://git.infradead.org/ubifs-2.6.git
 W:      http://www.linux-mtd.infradead.org/doc/ubifs.html
 S:      Maintained
 
@@ -4246,7 +4299,7 @@ P:	Artem Bityutskiy
 M:      dedekind@infradead.org
 W:      http://www.linux-mtd.infradead.org/
 L:      linux-mtd@lists.infradead.org
-T:      git git://git.infradead.org/~dedekind/ubi-2.6.git
+T:      git git://git.infradead.org/ubi-2.6.git
 S:      Maintained
 
 USB ACM DRIVER