1 files changed, 50 insertions, 39 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index c984014a5ce5..8619861dd345 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -763,9 +763,10 @@ S:	Maintained
 
 AUXILIARY DISPLAY DRIVERS
 P:      Miguel Ojeda Sandonis
-M:      maxextreme@gmail.com
+M:      miguel.ojeda.sandonis@gmail.com
 L:      linux-kernel@vger.kernel.org
-W:      http://auxdisplay.googlepages.com/
+W:      http://miguelojeda.es/auxdisplay.htm
+W:      http://jair.lab.fi.uva.es/~migojed/auxdisplay.htm
 S:      Maintained
 
 AVR32 ARCHITECTURE
@@ -1055,16 +1056,18 @@ S:	Supported
 
 CFAG12864B LCD DRIVER
 P:      Miguel Ojeda Sandonis
-M:      maxextreme@gmail.com
+M:      miguel.ojeda.sandonis@gmail.com
 L:      linux-kernel@vger.kernel.org
-W:      http://auxdisplay.googlepages.com/
+W:      http://miguelojeda.es/auxdisplay.htm
+W:      http://jair.lab.fi.uva.es/~migojed/auxdisplay.htm
 S:      Maintained
 
 CFAG12864BFB LCD FRAMEBUFFER DRIVER
 P:      Miguel Ojeda Sandonis
-M:      maxextreme@gmail.com
+M:      miguel.ojeda.sandonis@gmail.com
 L:      linux-kernel@vger.kernel.org
-W:      http://auxdisplay.googlepages.com/
+W:      http://miguelojeda.es/auxdisplay.htm
+W:      http://jair.lab.fi.uva.es/~migojed/auxdisplay.htm
 S:      Maintained
 
 CFG80211 and NL80211
@@ -1420,6 +1423,14 @@ M:	kristen.c.accardi@intel.com
 L:      linux-acpi@vger.kernel.org
 S:      Supported
 
+DOCUMENTATION (/Documentation directory)
+P:     Michael Kerrisk
+M:     mtk.manpages@gmail.com
+P:     Randy Dunlap
+M:     rdunlap@xenotime.net
+L:     linux-doc@vger.kernel.org
+S:     Maintained
+
 DOUBLETALK DRIVER
 P:      James R. Van Zandt
 M:      jrv@vanzandt.mv.com
@@ -1626,13 +1637,13 @@ S:	Maintained
 
 EXT3 FILE SYSTEM
 P:      Stephen Tweedie, Andrew Morton
-M:      sct@redhat.com, akpm@linux-foundation.org, adilger@clusterfs.com
+M:      sct@redhat.com, akpm@linux-foundation.org, adilger@sun.com
 L:      linux-ext4@vger.kernel.org
 S:      Maintained
 
 EXT4 FILE SYSTEM
 P:      Stephen Tweedie, Andrew Morton
-M:      sct@redhat.com, akpm@linux-foundation.org, adilger@clusterfs.com
+M:      sct@redhat.com, akpm@linux-foundation.org, adilger@sun.com
 L:      linux-ext4@vger.kernel.org
 S:      Maintained
 
@@ -2428,9 +2439,10 @@ S:	Maintained
 
 KS0108 LCD CONTROLLER DRIVER
 P:      Miguel Ojeda Sandonis
-M:      maxextreme@gmail.com
+M:      miguel.ojeda.sandonis@gmail.com
 L:      linux-kernel@vger.kernel.org
-W:      http://auxdisplay.googlepages.com/
+W:      http://miguelojeda.es/auxdisplay.htm
+W:      http://jair.lab.fi.uva.es/~migojed/auxdisplay.htm
 S:      Maintained
 
 LAPB module
@@ -2474,9 +2486,11 @@ M:	James.Bottomley@HansenPartnership.com
 W:      http://www.hansenpartnership.com/voyager
 S:      Maintained
 
-LINUX FOR POWERPC
+LINUX FOR POWERPC (32-BIT AND 64-BIT)
 P:      Paul Mackerras
 M:      paulus@samba.org
+P:      Benjamin Herrenschmidt
+M:      benh@kernel.crashing.org
 W:      http://www.penguinppc.org/
 L:      linuxppc-dev@ozlabs.org
 T:      git kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc.git
@@ -2514,13 +2528,6 @@ W:	http://wiki.secretlab.ca/index.php/Linux_on_Xilinx_Virtex
 L:      linuxppc-dev@ozlabs.org
 S:      Maintained
 
-LINUX FOR POWERPC BOOT CODE
-P:      Tom Rini
-M:      trini@kernel.crashing.org
-W:      http://www.penguinppc.org/
-L:      linuxppc-dev@ozlabs.org
-S:      Maintained
-
 LINUX FOR POWERPC EMBEDDED PPC8XX
 P:      Vitaly Bordug
 M:      vitb@kernel.crashing.org
@@ -2549,17 +2556,6 @@ P:	Arnaldo Carvalho de Melo
 M:      acme@ghostprotocols.net
 S:      Maintained
 
-LINUX FOR 64BIT POWERPC
-P:      Paul Mackerras
-M:      paulus@samba.org
-M:      paulus@au.ibm.com
-P:      Anton Blanchard
-M:      anton@samba.org
-M:      anton@au.ibm.com
-W:      http://www.penguinppc.org/ppc64/
-L:      linuxppc-dev@ozlabs.org
-S:      Supported
-
 LINUX SECURITY MODULE (LSM) FRAMEWORK
 P:      Chris Wright
 M:      chrisw@sous-sol.org
@@ -2678,8 +2674,8 @@ S: 	Supported
 MAN-PAGES: MANUAL PAGES FOR LINUX -- Sections 2, 3, 4, 5, and 7
 P:      Michael Kerrisk
 M:      mtk.manpages@gmail.com
-W:      ftp://ftp.kernel.org/pub/linux/docs/manpages
-S:      Maintained
+W:     http://www.kernel.org/doc/man-pages
+S:     Supported
 
 MARVELL LIBERTAS WIRELESS DRIVER
 P:      Dan Williams
@@ -2812,6 +2808,12 @@ W:	https://tango.0pointer.de/mailman/listinfo/s270-linux
 W:      http://0pointer.de/lennart/tchibo.html
 S:      Maintained
 
+MULTIFUNCTION DEVICES (MFD)
+P:      Samuel Ortiz
+M:      sameo@openedhand.com
+L:      linux-kernel@vger.kernel.org
+S:      Supported
+
 MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND SDIO SUBSYSTEM
 P:      Pierre Ossman
 M:      drzeus-mmc@drzeus.cx
@@ -3078,8 +3080,8 @@ L:	linux-scsi@vger.kernel.org
 S:      Maintained
 
 OPROFILE
-P:      Philippe Elie
-M:      phil.el@wanadoo.fr
+P:      Robert Richter
+M:      robert.richter@amd.com
 L:      oprofile-list@lists.sf.net
 S:      Maintained
 
@@ -3193,8 +3195,8 @@ L:	netdev@vger.kernel.org
 S:      Maintained
 
 PER-TASK DELAY ACCOUNTING
-P:      Shailabh Nagar
-M:      nagar@watson.ibm.com
+P:      Balbir Singh
+M:      balbir@linux.vnet.ibm.com
 L:      linux-kernel@vger.kernel.org
 S:      Maintained
 
@@ -3686,7 +3688,7 @@ S:	Maintained
 
 SLAB ALLOCATOR
 P:      Christoph Lameter
-M:      clameter@sgi.com
+M:      cl@linux-foundation.org
 P:      Pekka Enberg
 M:      penberg@cs.helsinki.fi
 P:      Matt Mackall
@@ -3896,8 +3898,8 @@ M:	hch@infradead.org
 S:      Maintained
 
 TASKSTATS STATISTICS INTERFACE
-P:      Shailabh Nagar
-M:      nagar@watson.ibm.com
+P:      Balbir Singh
+M:      balbir@linux.vnet.ibm.com
 L:      linux-kernel@vger.kernel.org
 S:      Maintained
 
@@ -3993,7 +3995,8 @@ W:	http://www.buzzard.org.uk/toshiba/
 S:      Maintained
 
 TPM DEVICE DRIVER
-P:      Kylene Hall
+P:     Debora Velarde
+P:     Rajiv Andrade
 M:      tpmdd-devel@lists.sourceforge.net
 W:      http://tpmdd.sourceforge.net
 P:      Marcel Selhorst
@@ -4312,6 +4315,14 @@ L:	netdev@vger.kernel.org
 W:      http://www.linux-usb.org/usbnet
 S:      Maintained
 
+USB VIDEO CLASS
+P:      Laurent Pinchart
+M:      laurent.pinchart@skynet.be
+L:      linx-uvc-devel@berlios.de
+L:      video4linux-list@redhat.com
+W:      http://linux-uvc.berlios.de
+S:      Maintained
+
 USB W996[87]CF DRIVER
 P:      Luca Risolia
 M:      luca.risolia@studio.unibo.it