1 files changed, 43 insertions, 7 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index aed47f2d11a7..0765bb6aa3cb 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -71,7 +71,7 @@ P: Person
 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.
@@ -159,7 +159,8 @@ F:	drivers/net/r8169.c
 8250/16?50 (AND CLONE UARTS) SERIAL DRIVER
 L:      linux-serial@vger.kernel.org
 W:      http://serial.sourceforge.net
-S:      Orphan
+M:      alan@lxorguk.ukuu.org.uk
+S:      Odd Fixes
 F:      drivers/serial/8250*
 F:      include/linux/serial_8250.h
 
@@ -1808,10 +1809,10 @@ F:	drivers/char/epca*
 F:      drivers/char/digi*
 
 DIRECTORY NOTIFICATION (DNOTIFY)
-P:      Stephen Rothwell
-M:      sfr@canb.auug.org.au
+P:      Eric Paris
+M:      eparis@parisplace.org
 L:      linux-kernel@vger.kernel.org
-S:      Supported
+S:      Maintained
 F:      Documentation/filesystems/dnotify.txt
 F:      fs/notify/dnotify/
 F:      include/linux/dnotify.h
@@ -1985,6 +1986,16 @@ F:	Documentation/edac.txt
 F:      drivers/edac/edac_*
 F:      include/linux/edac.h
 
+EDAC-AMD64
+P:      Doug Thompson
+M:      dougthompson@xmission.com
+P:      Borislav Petkov
+M:      borislav.petkov@amd.com
+L:      bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
+W:      bluesmoke.sourceforge.net
+S:      Supported
+F:      drivers/edac/amd64_edac*
+
 EDAC-E752X
 P:      Mark Gross
 M:      mark.gross@intel.com
@@ -2854,6 +2865,8 @@ P:	John McCutchan
 M:      john@johnmccutchan.com
 P:      Robert Love
 M:      rlove@rlove.org
+P:      Eric Paris
+M:      eparis@parisplace.org
 L:      linux-kernel@vger.kernel.org
 S:      Maintained
 F:      Documentation/filesystems/inotify.txt
@@ -3357,6 +3370,16 @@ F:	drivers/serial/kgdboc.c
 F:      include/linux/kgdb.h
 F:      kernel/kgdb.c
 
+KMEMLEAK
+P:      Catalin Marinas
+M:      catalin.marinas@arm.com
+L:      linux-kernel@vger.kernel.org
+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:      eduard.munteanu@linux360.ro
@@ -4462,6 +4485,16 @@ S:	Maintained
 F:      include/linux/delayacct.h
 F:      kernel/delayacct.c
 
+PERFORMANCE COUNTER SUBSYSTEM
+P:      Peter Zijlstra
+M:      a.p.zijlstra@chello.nl
+P:      Paul Mackerras
+M:      paulus@samba.org
+P:      Ingo Molnar
+M:      mingo@elte.hu
+L:      linux-kernel@vger.kernel.org
+S:      Supported
+
 PERSONALITY HANDLING
 P:      Christoph Hellwig
 M:      hch@infradead.org
@@ -4644,7 +4677,8 @@ F:	drivers/pcmcia/pxa2xx*
 F:      drivers/spi/pxa2xx*
 F:      drivers/usb/gadget/pxa2*
 F:      include/sound/pxa2xx-lib.h
-F:      sound/soc/pxa/pxa2xx*
+F:      sound/arm/pxa*
+F:      sound/soc/pxa
 
 PXA168 SUPPORT
 P:      Eric Miao
@@ -5371,11 +5405,12 @@ P:	Liam Girdwood
 M:      lrg@slimlogic.co.uk
 P:      Mark Brown
 M:      broonie@opensource.wolfsonmicro.com
-T:      git git://opensource.wolfsonmicro.com/linux-2.6-asoc
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git
 L:      alsa-devel@alsa-project.org (subscribers-only)
 W:      http://alsa-project.org/main/index.php/ASoC
 S:      Supported
 F:      sound/soc/
+F:      include/sound/soc*
 
 SPARC + UltraSPARC (sparc/sparc64)
 P:      David S. Miller
@@ -5684,6 +5719,7 @@ P:	Alan Cox
 M:      alan@lxorguk.ukuu.org.uk
 L:      linux-kernel@vger.kernel.org
 S:      Maintained
+T:      stgit http://zeniv.linux.org.uk/~alan/ttydev/
 
 TULIP NETWORK DRIVERS
 P:      Grant Grundler