Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[pandora-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 1e6b6bd..716c548 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -161,7 +161,7 @@ M:  Greg Kroah-Hartman <gregkh@suse.de>
 L:     linux-serial@vger.kernel.org
 W:     http://serial.sourceforge.net
 S:     Maintained
-T:     quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git
 F:     drivers/serial/8250*
 F:     include/linux/serial_8250.h
 
@@ -432,7 +432,7 @@ AMS (Apple Motion Sensor) DRIVER
 M:     Stelian Pop <stelian@popies.net>
 M:     Michael Hanselmann <linux-kernel@hansmi.ch>
 S:     Supported
-F:     drivers/hwmon/ams/
+F:     drivers/macintosh/ams/
 
 AMSO1100 RNIC DRIVER
 M:     Tom Tucker <tom@opengridcomputing.com>
@@ -1391,6 +1391,14 @@ L:       netdev@vger.kernel.org
 S:     Supported
 F:     drivers/net/tg3.*
 
+BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER
+M:     Brett Rudley <brudley@broadcom.com>
+M:     Henry Ptasinski <henryp@broadcom.com>
+M:     Nohee Ko <noheek@broadcom.com>
+L:     linux-wireless@vger.kernel.org
+S:     Supported
+F:     drivers/staging/brcm80211/
+
 BROCADE BFA FC SCSI DRIVER
 M:     Jing Huang <huangj@brocade.com>
 L:     linux-scsi@vger.kernel.org
@@ -1605,7 +1613,7 @@ F:        drivers/platform/x86/classmate-laptop.c
 COCCINELLE/Semantic Patches (SmPL)
 M:     Julia Lawall <julia@diku.dk>
 M:     Gilles Muller <Gilles.Muller@lip6.fr>
-M:     Nicolas Palix <npalix@diku.dk>
+M:     Nicolas Palix <npalix.work@gmail.com>
 L:     cocci@diku.dk (moderated for non-subscribers)
 W:     http://coccinelle.lip6.fr/
 S:     Supported
@@ -1749,6 +1757,7 @@ L:        linux-cris-kernel@axis.com
 W:     http://developer.axis.com
 S:     Maintained
 F:     arch/cris/
+F:     drivers/serial/crisv10.*
 
 CRYPTO API
 M:     Herbert Xu <herbert@gondor.apana.org.au>
@@ -3383,8 +3392,8 @@ F:        Documentation/kdump/
 KERNEL AUTOMOUNTER (AUTOFS)
 M:     "H. Peter Anvin" <hpa@zytor.com>
 L:     autofs@linux.kernel.org
-S:     Odd Fixes
-F:     fs/autofs/
+S:     Obsolete
+F:     drivers/staging/autofs/
 
 KERNEL AUTOMOUNTER v4 (AUTOFS4)
 M:     Ian Kent <raven@themaw.net>
@@ -5667,7 +5676,7 @@ S:        Maintained
 
 STAGING SUBSYSTEM
 M:     Greg Kroah-Hartman <gregkh@suse.de>
-T:     quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-next-2.6.git
 L:     devel@driverdev.osuosl.org
 S:     Maintained
 F:     drivers/staging/
@@ -5901,7 +5910,7 @@ S:        Maintained
 TTY LAYER
 M:     Greg Kroah-Hartman <gregkh@suse.de>
 S:     Maintained
-T:     quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git
 F:     drivers/char/tty_*
 F:     drivers/serial/serial_core.c
 F:     include/linux/serial_core.h
@@ -6457,6 +6466,12 @@ S:       Maintained
 F:     Documentation/hwmon/w83793
 F:     drivers/hwmon/w83793.c
 
+W83795 HARDWARE MONITORING DRIVER
+M:     Jean Delvare <khali@linux-fr.org>
+L:     lm-sensors@lm-sensors.org
+S:     Maintained
+F:     drivers/hwmon/w83795.c
+
 W83L51xD SD/MMC CARD INTERFACE DRIVER
 M:     Pierre Ossman <pierre@ossman.eu>
 S:     Maintained
@@ -6581,11 +6596,25 @@ T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86.
 S:     Maintained
 F:     drivers/platform/x86
 
+XEN PCI SUBSYSTEM
+M:     Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
+L:     xen-devel@lists.xensource.com (moderated for non-subscribers)
+S:     Supported
+F:     arch/x86/pci/*xen*
+F:     drivers/pci/*xen*
+
+XEN SWIOTLB SUBSYSTEM
+M:     Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
+L:     xen-devel@lists.xensource.com (moderated for non-subscribers)
+S:     Supported
+F:     arch/x86/xen/*swiotlb*
+F:     drivers/xen/*swiotlb*
+
 XEN HYPERVISOR INTERFACE
-M:     Jeremy Fitzhardinge <jeremy@xensource.com>
-M:     Chris Wright <chrisw@sous-sol.org>
+M:     Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
+M:     Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
+L:     xen-devel@lists.xensource.com (moderated for non-subscribers)
 L:     virtualization@lists.osdl.org
-L:     xen-devel@lists.xensource.com
 S:     Supported
 F:     arch/x86/xen/
 F:     drivers/*/xen-*front.c