1 files changed, 41 insertions, 10 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index c16b986d7e0a..2b9212f90446 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -216,8 +216,8 @@ W:	http://code.google.com/p/aceracpi
 S:      Maintained
 
 ACPI
-P:      Len Brown
-M:      len.brown@intel.com
+P:      Andi Kleen
+M:      ak@linux.intel.com
 M:      lenb@kernel.org
 L:      linux-acpi@vger.kernel.org
 W:      http://www.lesswatts.org/projects/acpi/
@@ -239,8 +239,8 @@ W:	http://www.lesswatts.org/projects/acpi/
 S:      Supported
 
 ACPI FAN DRIVER
-P:      Len Brown
-M:      len.brown@intel.com
+P:      Zhang Rui
+M:      rui.zhang@intel.com
 L:      linux-acpi@vger.kernel.org
 W:      http://www.lesswatts.org/projects/acpi/
 S:      Supported
@@ -252,14 +252,14 @@ L:	pcihpd-discuss@lists.sourceforge.net
 S:      Supported
 
 ACPI THERMAL DRIVER
-P:      Len Brown
-M:      len.brown@intel.com
+P:      Zhang Rui
+M:      rui.zhang@intel.com
 L:      linux-acpi@vger.kernel.org
 W:      http://www.lesswatts.org/projects/acpi/
 S:      Supported
 
 ACPI VIDEO DRIVER
-P:      Rui Zhang
+P:      Zhang Rui
 M:      rui.zhang@intel.com
 L:      linux-acpi@vger.kernel.org
 W:      http://www.lesswatts.org/projects/acpi/
@@ -1162,6 +1162,11 @@ M:	scott@spiteful.org
 L:      pcihpd-discuss@lists.sourceforge.net
 S:      Supported
 
+COMPAL LAPTOP SUPPORT
+P:      Cezary Jackiewicz
+M:      cezary.jackiewicz@gmail.com
+S:      Maintained
+
 COMPUTONE INTELLIPORT MULTIPORT CARD
 P:      Michael H. Warfield
 M:      mhw@wittsend.com
@@ -1688,6 +1693,13 @@ L:	linuxppc-embedded@ozlabs.org
 L:      linux-kernel@vger.kernel.org
 S:      Maintained
 
+FREESCALE I2C CPM DRIVER
+P:      Jochen Friedrich
+M:      jochen@scram.de
+L:      linuxppc-dev@ozlabs.org
+L:      i2c@lm-sensors.org
+S:      Maintained
+
 FREESCALE SOC FS_ENET DRIVER
 P:      Pantelis Antoniou
 M:      pantelis.antoniou@gmail.com
@@ -1772,11 +1784,22 @@ M:	hch@infradead.org
 W:      ftp://ftp.openlinux.org/pub/people/hch/vxfs
 S:      Maintained
 
+FTRACE
+P:      Steven Rostedt
+M:      srostedt@redhat.com
+S:      Maintained
+
 FUJITSU FR-V (FRV) PORT
 P:      David Howells
 M:      dhowells@redhat.com
 S:      Maintained
 
+FUJITSU LAPTOP EXTRAS
+P:      Jonathan Woithe
+M:      jwoithe@physics.adelaide.edu.au
+L:      linux-acpi@vger.kernel.org
+S:      Maintained
+
 FUSE: FILESYSTEM IN USERSPACE
 P:      Miklos Szeredi
 M:      miklos@szeredi.hu
@@ -2315,6 +2338,16 @@ L:	linux-mtd@lists.infradead.org
 W:      http://www.linux-mtd.infradead.org/doc/jffs2.html
 S:      Maintained
 
+UBI FILE SYSTEM (UBIFS)
+P:      Artem Bityutskiy
+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
+W:      http://www.linux-mtd.infradead.org/doc/ubifs.html
+S:      Maintained
+
 JFS FILESYSTEM
 P:      Dave Kleikamp
 M:      shaggy@austin.ibm.com
@@ -2511,13 +2544,11 @@ W:	http://www.penguinppc.org/
 L:      linuxppc-dev@ozlabs.org
 S:      Maintained
 
-LINUX FOR POWERPC EMBEDDED MPC52XX
+LINUX FOR POWERPC EMBEDDED MPC5XXX
 P:      Sylvain Munaut
 M:      tnt@246tNt.com
 P:      Grant Likely
 M:      grant.likely@secretlab.ca
-W:      http://www.246tNt.com/mpc52xx/
-W:      http://www.penguinppc.org/
 L:      linuxppc-dev@ozlabs.org
 S:      Maintained