1 files changed, 77 insertions, 18 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 6ba3ee822838..cecf1592609e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -72,8 +72,8 @@ 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.
-S: Status, one of the following:
 F: Applicable files and/or directories
+S: Status, one of the following:
 
         Supported:      Someone is actually paid to look after this.
         Maintained:     Someone actually looks after it.
@@ -1053,6 +1053,12 @@ L:	cbe-oss-dev@ozlabs.org
 W:      http://www.ibm.com/developerworks/power/cell/
 S:      Supported
 
+CERTIFIED WIRELESS USB (WUSB) SUBSYSTEM:
+P:      David Vrabel
+M:      david.vrabel@csr.com
+L:      linux-usb@vger.kernel.org
+S:      Supported
+
 CFAG12864B LCD DRIVER
 P:      Miguel Ojeda Sandonis
 M:      miguel.ojeda.sandonis@gmail.com
@@ -1198,7 +1204,7 @@ S:	Maintained
 
 CPU FREQUENCY DRIVERS
 P:      Dave Jones
-M:      davej@codemonkey.org.uk
+M:      davej@redhat.com
 L:      cpufreq@vger.kernel.org
 W:      http://www.codemonkey.org.uk/projects/cpufreq/
 T:      git kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git
@@ -1629,6 +1635,11 @@ P:	Christopher Hoover
 M:      ch@murgatroid.com, ch@hpl.hp.com
 S:      Maintained
 
+EPSON S1D13XXX FRAMEBUFFER DRIVER
+P:      Kristoffer Ericson
+M:      kristoffer.ericson@gmail.com
+S:      Maintained
+
 ETHEREXPRESS-16 NETWORK DRIVER
 P:      Philip Blundell
 M:      philb@gnu.org
@@ -2171,6 +2182,13 @@ M:	maciej.sosnowski@intel.com
 L:      linux-kernel@vger.kernel.org
 S:      Supported
 
+INTEL IOMMU (VT-d)
+P:      David Woodhouse
+M:      dwmw2@infradead.org
+L:      iommu@lists.linux-foundation.org
+T:      git://git.infradead.org/iommu-2.6.git
+S:      Supported
+
 INTEL IOP-ADMA DMA DRIVER
 P:      Dan Williams
 M:      dan.j.williams@intel.com
@@ -2443,7 +2461,14 @@ S:	Supported
 
 KERNEL VIRTUAL MACHINE (KVM)
 P:      Avi Kivity
-M:      avi@qumranet.com
+M:      avi@redhat.com
+L:      kvm@vger.kernel.org
+W:      http://kvm.qumranet.com
+S:      Supported
+
+KERNEL VIRTUAL MACHINE (KVM) FOR AMD-V
+P:      Joerg Roedel
+M:      joerg.roedel@amd.com
 L:      kvm@vger.kernel.org
 W:      http://kvm.qumranet.com
 S:      Supported
@@ -2797,15 +2822,6 @@ L:	linux-mtd@lists.infradead.org
 T:      git git://git.infradead.org/mtd-2.6.git
 S:      Maintained
 
-MEI MN10300/AM33 PORT
-P:      David Howells
-M:      dhowells@redhat.com
-P:      Koichi Yasutake
-M:      yasutake.koichi@jp.panasonic.com
-L:      linux-am33-list@redhat.com (moderated for non-subscribers)
-W:      ftp://ftp.redhat.com/pub/redhat/gnupro/AM33/
-S:      Maintained
-
 MICROTEK X6 SCANNER
 P:      Oliver Neukum
 M:      oliver@neukum.name
@@ -2925,9 +2941,9 @@ S:	Maintained
 
 NETEFFECT IWARP RNIC DRIVER (IW_NES)
 P:      Faisal Latif
-M:      flatif@neteffect.com
+M:      faisal.latif@intel.com
 P:      Chien Tung
-M:      ctung@neteffect.com
+M:      chien.tin.tung@intel.com
 L:      general@lists.openfabrics.org
 W:      http://www.neteffect.com
 S:      Supported
@@ -3170,6 +3186,15 @@ M:	olof@lixom.net
 L:      i2c@lm-sensors.org
 S:      Maintained
 
+PANASONIC MN10300/AM33 PORT
+P:      David Howells
+M:      dhowells@redhat.com
+P:      Koichi Yasutake
+M:      yasutake.koichi@jp.panasonic.com
+L:      linux-am33-list@redhat.com (moderated for non-subscribers)
+W:      ftp://ftp.redhat.com/pub/redhat/gnupro/AM33/
+S:      Maintained
+
 PARALLEL PORT SUPPORT
 L:      linux-parport@lists.infradead.org (subscribers-only)
 S:      Orphan
@@ -3925,7 +3950,7 @@ M:	jbglaw@lug-owl.de
 L:      linux-kernel@vger.kernel.org
 S:      Maintained
 
-STABLE BRANCH:
+STABLE BRANCH
 P:      Greg Kroah-Hartman
 M:      greg@kroah.com
 P:      Chris Wright
@@ -3933,6 +3958,13 @@ M:	chrisw@sous-sol.org
 L:      stable@kernel.org
 S:      Maintained
 
+STAGING SUBSYSTEM
+P:      Greg Kroah-Hartman
+M:      gregkh@suse.de
+L:      linux-kernel@vger.kernel.org
+T:      quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/
+S:      Maintained
+
 STARFIRE/DURALAN NETWORK DRIVER
 P:      Ion Badulescu
 M:      ionut@cs.columbia.edu
@@ -4089,7 +4121,7 @@ W:	http://tpmdd.sourceforge.net
 P:      Marcel Selhorst
 M:      tpm@selhorst.net
 W:      http://www.prosec.rub.de/tpm/
-L:      tpmdd-devel@lists.sourceforge.net
+L:      tpmdd-devel@lists.sourceforge.net (moderated for non-subscribers)
 S:      Maintained
 
 TRIVIAL PATCHES
@@ -4172,6 +4204,12 @@ L:	sparclinux@vger.kernel.org
 T:      git kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6.git
 S:      Maintained
 
+ULTRA-WIDEBAND (UWB) SUBSYSTEM:
+P:      David Vrabel
+M:      david.vrabel@csr.com
+L:      linux-usb@vger.kernel.org
+S:      Supported
+
 UNIFORM CDROM DRIVER
 P:      Jens Axboe
 M:      axboe@kernel.dk
@@ -4480,6 +4518,13 @@ W:	http://kernel.org/~kzak/util-linux-ng/
 T:      git://git.kernel.org/pub/scm/utils/util-linux-ng/util-linux-ng.git
 S:      Maintained
 
+UVESAFB DRIVER
+P:      Michal Januszewski
+M:      spock@gentoo.org
+L:      linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
+W:      http://dev.gentoo.org/~spock/projects/uvesafb/
+S:      Maintained
+
 VFAT/FAT/MSDOS FILESYSTEM
 P:      OGAWA Hirofumi
 M:      hirofumi@mail.parknet.co.jp
@@ -4497,6 +4542,14 @@ M:	khali@linux-fr.org
 L:      i2c@lm-sensors.org
 S:      Maintained
 
+VIA UNICHROME(PRO)/CHROME9 FRAMEBUFFER DRIVER
+P:      Joseph Chan
+M:      JosephChan@via.com.tw
+P:      Scott Fang
+M:      ScottFang@viatech.com.cn
+L:      linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
+S:      Maintained
+
 VIA VELOCITY NETWORK DRIVER
 P:      Francois Romieu
 M:      romieu@fr.zoreil.com
@@ -4520,10 +4573,11 @@ S:	Maintained
 
 VOLTAGE AND CURRENT REGULATOR FRAMEWORK
 P:      Liam Girdwood
-M:      lg@opensource.wolfsonmicro.com
+M:      lrg@slimlogic.co.uk
 P:      Mark Brown
 M:      broonie@opensource.wolfsonmicro.com
 W:      http://opensource.wolfsonmicro.com/node/15
+W:      http://www.slimlogic.co.uk/?page_id=5
 T:      git kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6.git
 S:      Supported
 
@@ -4581,6 +4635,11 @@ M:	zaga@fly.cc.fer.hr
 L:      linux-scsi@vger.kernel.org
 S:      Maintained
 
+WIMEDIA LLC PROTOCOL (WLP) SUBSYSTEM
+P:      David Vrabel
+M:      david.vrabel@csr.com
+S:      Maintained
+
 WISTRON LAPTOP BUTTON DRIVER
 P:      Miloslav Trmac
 M:      mitr@volny.cz
@@ -4597,7 +4656,7 @@ WM97XX TOUCHSCREEN DRIVERS
 P:      Mark Brown
 M:      broonie@opensource.wolfsonmicro.com
 P:      Liam Girdwood
-M:      liam.girdwood@wolfsonmicro.com
+M:      lrg@slimlogic.co.uk
 L:      linux-input@vger.kernel.org
 T:      git git://opensource.wolfsonmicro.com/linux-2.6-touch
 W:      http://opensource.wolfsonmicro.com/node/7