Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

[sfrench/cifs-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 4ce895a4b5ba7f584ca0af01daa39602a546b77c..845fbf4478b3adc2b972617892db8fadb8177fd2 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -315,10 +315,9 @@ M: zippel@linux-m68k.org
 S:     Maintained
 
 AGPGART DRIVER
-P:     Dave Jones
-M:     davej@codemonkey.org.uk
-W:     http://www.codemonkey.org.uk/projects/agp/
-T:     git kernel.org:/pub/scm/linux/kernel/git/davej/agpgart.git
+P:     David Airlie
+M:     airlied@linux.ie
+T:     git kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6.git
 S:     Maintained
 
 AHA152X SCSI DRIVER
@@ -371,7 +370,7 @@ P:  Tom Tucker
 M:     tom@opengridcomputing.com
 P:     Steve Wise
 M:     swise@opengridcomputing.com
-L:     openib-general@openib.org
+L:     general@lists.openfabrics.org
 S:     Maintained
 
 AOA (Apple Onboard Audio) ALSA DRIVER
@@ -1396,7 +1395,7 @@ P:        Hoang-Nam Nguyen
 M:     hnguyen@de.ibm.com
 P:     Christoph Raisch
 M:     raisch@de.ibm.com
-L:     openib-general@openib.org
+L:     general@lists.openfabrics.org
 S:     Supported
 
 EMU10K1 SOUND DRIVER
@@ -1750,8 +1749,8 @@ T:        http://www.harbaum.org/till/i2c_tiny_usb
 S:     Maintained
 
 i386 BOOT CODE
-P:     Riley H. Williams
-M:     Riley@Williams.Name
+P:     H. Peter Anvin
+M:     hpa@zytor.com
 L:     Linux-Kernel@vger.kernel.org
 S:     Maintained
 
@@ -1850,13 +1849,13 @@ M:      rolandd@cisco.com
 P:     Sean Hefty
 M:     mshefty@ichips.intel.com
 P:     Hal Rosenstock
-M:     halr@voltaire.com
-L:     openib-general@openib.org
+M:     hal.rosenstock@gmail.com 
+L:     general@lists.openfabrics.org
 W:     http://www.openib.org/
 T:     git kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git
 S:     Supported
 
-INPUT (KEYBOARD, MOUSE, JOYSTICK) DRIVERS
+INPUT (KEYBOARD, MOUSE, JOYSTICK, TOUCHSCREEN) DRIVERS
 P:     Dmitry Torokhov
 M:     dmitry.torokhov@gmail.com
 M:     dtor@mail.ru
@@ -1989,9 +1988,10 @@ M:       jjciarla@raiz.uncu.edu.ar
 S:     Maintained
 
 IPATH DRIVER:
-P:     Bryan O'Sullivan
-M:     support@pathscale.com
-L:     openib-general@openib.org
+P:     Arthur Jones
+M:     infinipath@qlogic.com
+L:     general@lists.openfabrics.org
+T:     git git://git.qlogic.com/ipath-linux-2.6
 S:     Supported
 
 IPMI SUBSYSTEM
@@ -2101,7 +2101,7 @@ S:        Maintained
 
 KERNEL JANITORS
 P:     Several
-L:     kernel-janitors@lists.linux-foundation.org
+L:     kernel-janitors@vger.kernel.org
 W:     http://www.kerneljanitors.org/
 S:     Maintained
 
@@ -2814,11 +2814,6 @@ P:       Kristen Carlson Accardi
 M:     kristen.c.accardi@intel.com
 S:     Supported
 
-PCI HOTPLUG COMPAQ DRIVER
-P:     Greg Kroah-Hartman
-M:     greg@kroah.com
-S:     Maintained
-
 PCIE HOTPLUG DRIVER
 P:     Kristen Carlson Accardi
 M:     kristen.c.accardi@intel.com
@@ -2903,6 +2898,11 @@ P:       Michal Ostrowski
 M:     mostrows@speakeasy.net
 S:     Maintained
 
+PPP OVER L2TP
+P:     James Chapman
+M:     jchapman@katalix.com
+S:     Maintained
+
 PREEMPTIBLE KERNEL
 P:     Robert Love
 M:     rml@tech9.net
@@ -2930,6 +2930,13 @@ M:       mikpe@it.uu.se
 L:     linux-ide@vger.kernel.org
 S:     Maintained
 
+PS3 NETWORK SUPPORT
+P:     Masakazu Mokuno
+M:     mokuno@sm.sony.co.jp
+L:     netdev@vger.kernel.org
+L:     cbe-oss-dev@ozlabs.org
+S:     Supported
+
 PS3 PLATFORM SUPPORT
 P:     Geoff Levand
 M:     geoffrey.levand@am.sony.com
@@ -3049,6 +3056,16 @@ S:       Maintained
 RISCOM8 DRIVER
 S:     Orphan
 
+RTL818X WIRELESS DRIVER
+P:     Michael Wu
+M:     flamingice@sourmilk.net
+P:     Andrea Merello
+M:     andreamrl@tiscali.it
+L:     linux-wireless@vger.kernel.org
+W:     http://linuxwireless.org/
+T:     git kernel.org:/pub/scm/linux/kernel/git/mwu/mac80211-drivers.git
+S:     Maintained
+
 S3 SAVAGE FRAMEBUFFER DRIVER
 P:     Antonino Daplas
 M:     adaplas@gmail.com
@@ -3618,7 +3635,7 @@ W:        http://www.kroah.com/linux-usb/
 USB DAVICOM DM9601 DRIVER
 P:     Peter Korsgaard
 M:     jacmet@sunsite.dk
-L:     linux-usb-devel@lists.sourceforge.net
+L:     netdev@vger.kernel.org
 W:     http://www.linux-usb.org/usbnet
 S:     Maintained
 
@@ -3702,23 +3719,23 @@ S:      Maintained
 USB PEGASUS DRIVER
 P:     Petko Manolov
 M:     petkan@users.sourceforge.net
-L:     linux-usb-users@lists.sourceforge.net
 L:     linux-usb-devel@lists.sourceforge.net
+L:     netdev@vger.kernel.org
 W:     http://pegasus2.sourceforge.net/
 S:     Maintained
 
-USB PRINTER DRIVER
-P:     Vojtech Pavlik
-M:     vojtech@suse.cz
+USB PRINTER DRIVER (usblp)
+P:     Pete Zaitcev
+M:     zaitcev@redhat.com
 L:     linux-usb-users@lists.sourceforge.net
 L:     linux-usb-devel@lists.sourceforge.net
-S:     Maintained
+S:     Supported
 
 USB RTL8150 DRIVER
 P:     Petko Manolov
 M:     petkan@users.sourceforge.net
-L:     linux-usb-users@lists.sourceforge.net
 L:     linux-usb-devel@lists.sourceforge.net
+L:     netdev@vger.kernel.org
 W:     http://pegasus2.sourceforge.net/
 S:     Maintained
 
@@ -3829,7 +3846,7 @@ S:        Maintained
 USB "USBNET" DRIVER FRAMEWORK
 P:     David Brownell
 M:     dbrownell@users.sourceforge.net
-L:     linux-usb-devel@lists.sourceforge.net
+L:     netdev@vger.kernel.org
 W:     http://www.linux-usb.org/usbnet
 S:     Maintained