1 files changed, 80 insertions, 15 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 988b0a852890..277451a52695 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -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
@@ -1427,8 +1433,8 @@ M:	rdunlap@xenotime.net
 S:      Maintained
 
 DOCKING STATION DRIVER
-P:      Kristen Carlson Accardi
-M:      kristen.c.accardi@intel.com
+P:      Shaohua Li
+M:      shaohua.li@intel.com
 L:      linux-acpi@vger.kernel.org
 S:      Supported
 
@@ -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
@@ -2098,6 +2109,12 @@ L:	linux-ide@vger.kernel.org
 L:      linux-scsi@vger.kernel.org
 S:      Orphan
 
+IDLE-I7300
+P:      Andy Henroid
+M:      andrew.d.henroid@intel.com
+L:      linux-pm@lists.linux-foundation.org
+S:      Supported
+
 IEEE 1394 SUBSYSTEM (drivers/ieee1394)
 P:      Ben Collins
 M:      ben.collins@ubuntu.com
@@ -2171,6 +2188,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 +2467,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
@@ -2916,9 +2947,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
@@ -3161,6 +3192,11 @@ M:	olof@lixom.net
 L:      i2c@lm-sensors.org
 S:      Maintained
 
+PANASONIC LAPTOP ACPI EXTRAS DRIVER
+P:      Harald Welte
+M:      laforge@gnumonks.org
+S:      Maintained
+
 PANASONIC MN10300/AM33 PORT
 P:      David Howells
 M:      dhowells@redhat.com
@@ -3232,11 +3268,6 @@ L:	linux-pci@vger.kernel.org
 T:      git kernel.org:/pub/scm/linux/kernel/git/jbarnes/pci-2.6.git
 S:      Supported
 
-PCI HOTPLUG CORE
-P:      Kristen Carlson Accardi
-M:      kristen.c.accardi@intel.com
-S:      Supported
-
 PCIE HOTPLUG DRIVER
 P:      Kristen Carlson Accardi
 M:      kristen.c.accardi@intel.com
@@ -3925,7 +3956,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 +3964,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 +4127,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 +4210,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 +4524,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 +4548,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 +4579,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 +4641,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 +4662,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