Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

[sfrench/cifs-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 87ba4a6a5875785e49f8bdc73e92840e2cffdc7f..22303e5fe4ce41986bc14a6b2a68cc20b418f845 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1629,6 +1629,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 +2176,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 +2455,7 @@ 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
@@ -3932,7 +3944,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
@@ -3940,6 +3952,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
@@ -4096,7 +4115,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
@@ -4487,6 +4506,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
@@ -4504,6 +4530,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
@@ -4605,7 +4639,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