1 files changed, 150 insertions, 76 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 1b1092e74695..fbe0dca1c0ed 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -194,13 +194,6 @@ M:	jes@trained-monkey.org
 L:      linux-acenic@sunsite.dk
 S:      Maintained
 
-ACI MIXER DRIVER
-P:      Robert Siemer
-M:      Robert.Siemer@gmx.de
-L:      linux-sound@vger.kernel.org
-W:      http://www.stud.uni-karlsruhe.de/~uh1b/
-S:      Maintained
-
 IPS SCSI RAID DRIVER
 P:      Adaptec OEM Raid Solutions
 M:      aacraid@adaptec.com
@@ -272,21 +265,6 @@ L:	linux-acpi@vger.kernel.org
 W:      http://acpi.sourceforge.net/
 S:      Supported
 
-AD1816 SOUND DRIVER
-P:      Thorsten Knabe
-M:      Thorsten Knabe <linux@thorsten-knabe.de>
-W:      http://linux.thorsten-knabe.de
-S:      Maintained
-
-AD1889 SOUND DRIVER
-P:      Kyle McMartin
-M:      kyle@parisc-linux.org
-P:      Thibaut Varene
-M:      T-Bone@parisc-linux.org
-W:      http://wiki.parisc-linux.org/AD1889
-L:      parisc-linux@lists.parisc-linux.org
-S:      Maintained
-
 ADM1025 HARDWARE MONITOR DRIVER
 P:      Jean Delvare
 M:      khali@linux-fr.org
@@ -315,10 +293,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 +348,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
@@ -761,6 +738,13 @@ L:	uclinux-dist-devel@blackfin.uclinux.org (subscribers-only)
 W:      http://blackfin.uclinux.org
 S:      Supported
 
+BLACKFIN EMAC DRIVER
+P:      Bryan Wu
+M:      bryan.wu@analog.com
+L:      uclinux-dist-devel@blackfin.uclinux.org (subscribers-only)
+W:      http://blackfin.uclinux.org
+S:      Supported
+
 BLACKFIN RTC DRIVER
 P:      Mike Frysinger
 M:      michael.frysinger@analog.com
@@ -942,6 +926,12 @@ M:	mchan@broadcom.com
 L:      netdev@vger.kernel.org
 S:      Supported
 
+BSG (block layer generic sg v4 driver)
+P:      FUJITA Tomonori
+M:      fujita.tomonori@lab.ntt.co.jp
+L:      linux-scsi@vger.kernel.org
+S:      Supported
+
 BTTV VIDEO4LINUX DRIVER
 P:      Mauro Carvalho Chehab
 M:      mchehab@infradead.org
@@ -1283,6 +1273,12 @@ M:	tori@unhappy.mine.nu
 L:      netdev@vger.kernel.org
 S:      Maintained
 
+DMA GENERIC MEMCPY SUBSYSTEM
+P:      Shannon Nelson
+M:      shannon.nelson@intel.com
+L:      linux-kernel@vger.kernel.org
+S:      Maintained
+
 DME1737 HARDWARE MONITOR DRIVER
 P:      Juerg Haefliger
 M:      juergh@gmail.com
@@ -1368,21 +1364,60 @@ S:	Supported
 
 EDAC-CORE
 P:      Doug Thompson
-M:      norsk5@xmission.com
+M:      dougthompson@xmission.com
 L:      bluesmoke-devel@lists.sourceforge.net
 W:      bluesmoke.sourceforge.net
 S:      Supported
 
 EDAC-E752X
 P:      Mark Gross
+P:      Doug Thompson
 M:      mark.gross@intel.com
+M:      dougthompson@xmission.com
 L:      bluesmoke-devel@lists.sourceforge.net
 W:      bluesmoke.sourceforge.net
 S:      Maintained
 
 EDAC-E7XXX
 P:      Doug Thompson
-M:      norsk5@xmission.com
+M:      dougthompson@xmission.com
+L:      bluesmoke-devel@lists.sourceforge.net
+W:      bluesmoke.sourceforge.net
+S:      Maintained
+
+EDAC-I82443BXGX
+P:      Tim Small
+M:      tim@buttersideup.com
+L:      bluesmoke-devel@lists.sourceforge.net
+W:      bluesmoke.sourceforge.net
+S:      Maintained
+
+EDAC-I3000
+P:      Jason Uhlenkott
+M:      juhlenko@akamai.com
+L:      bluesmoke-devel@lists.sourceforge.net
+W:      bluesmoke.sourceforge.net
+S:      Maintained
+
+EDAC-I5000
+P:      Doug Thompson
+M:      dougthompson@xmission.com
+L:      bluesmoke-devel@lists.sourceforge.net
+W:      bluesmoke.sourceforge.net
+S:      Maintained
+
+EDAC-I82975X
+P:      Ranganathan Desikan
+P:      Arvind R.
+M:      rdesikan@jetzbroadband.com
+M:      arvind@acarlab.com
+L:      bluesmoke-devel@lists.sourceforge.net
+W:      bluesmoke.sourceforge.net
+S:      Maintained
+
+EDAC-PASEMI
+P:      Egor Martovetsky
+M:      egor@pasemi.com
 L:      bluesmoke-devel@lists.sourceforge.net
 W:      bluesmoke.sourceforge.net
 S:      Maintained
@@ -1408,16 +1443,9 @@ 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
-P:      James Courtier-Dutton
-M:      James@superbug.demon.co.uk
-L:      emu10k1-devel@lists.sourceforge.net
-W:      http://sourceforge.net/projects/emu10k1/
-S:      Maintained
-
 EMULEX LPFC FC SCSI DRIVER
 P:      James Smart
 M:      james.smart@emulex.com
@@ -1768,14 +1796,15 @@ 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
 
 i386 SETUP CODE / CPU ERRATA WORKAROUNDS
 P:      H. Peter Anvin
 M:      hpa@zytor.com
+T:      git.kernel.org:/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup.git
 S:      Maintained
 
 IA64 (Itanium) PLATFORM
@@ -1868,13 +1897,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
@@ -1919,6 +1948,12 @@ P:	Tigran Aivazian
 M:      tigran@aivazian.fsnet.co.uk
 S:      Maintained
 
+INTEL I/OAT DMA DRIVER
+P:      Shannon Nelson
+M:      shannon.nelson@intel.com
+L:      linux-kernel@vger.kernel.org
+S:      Supported
+
 INTEL IXP4XX RANDOM NUMBER GENERATOR SUPPORT
 P:      Deepak Saxena
 M:      dsaxena@plexity.net
@@ -2007,9 +2042,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
@@ -2315,6 +2351,14 @@ M:	matthew@wil.cx
 L:      linux-scsi@vger.kernel.org
 S:      Maintained
 
+M32R ARCHITECTURE
+P:      Hirokazu Takata
+M:      takata@linux-m32r.org
+L:      linux-m32r@ml.linux-m32r.org
+L:      linux-m32r-ja@ml.linux-m32r.org (in Japanese)
+W:      http://www.linux-m32r.org/
+S:      Maintained
+
 M68K ARCHITECTURE
 P:      Geert Uytterhoeven
 M:      geert@linux-m68k.org
@@ -2348,6 +2392,12 @@ W:	http://linuxwireless.org/
 T:      git kernel.org:/pub/scm/linux/kernel/git/jbenc/mac80211.git
 S:      Maintained
 
+MACVLAN DRIVER
+P:      Patrick McHardy
+M:      kaber@trash.net
+L:      netdev@vger.kernel.org
+S:      Maintained
+
 MARVELL YUKON / SYSKONNECT DRIVER
 P:      Mirko Lindner
 M:      mlindner@syskonnect.de
@@ -2408,7 +2458,7 @@ P:	Artem Bityutskiy
 M:      dedekind@infradead.org
 W:      http://www.linux-mtd.infradead.org/
 L:      linux-mtd@lists.infradead.org
-T:      git git://git.infradead.org/ubi-2.6.git
+T:      git git://git.infradead.org/~dedekind/ubi-2.6.git
 S:      Maintained
 
 MICROTEK X6 SCANNER
@@ -2634,12 +2684,6 @@ M:	yokota@netlab.is.tsukuba.ac.jp
 W:      http://www.netlab.is.tsukuba.ac.jp/~yokota/izumi/ninja/
 S:      Maintained
 
-NON-IDE/NON-SCSI CDROM DRIVERS [GENERAL] (come on, crew - mark your responsibility)
-P:      Eberhard Moenkeberg
-M:      emoenke@gwdg.de
-L:      linux-kernel@vger.kernel.org
-S:      Maintained
-
 NTFS FILESYSTEM
 P:      Anton Altaparmakov
 M:      aia21@cantab.net
@@ -2722,12 +2766,6 @@ L:	osst-users@lists.sourceforge.net
 L:      linux-scsi@vger.kernel.org
 S:      Maintained
 
-OPL3-SA2, SA3, and SAx DRIVER
-P:      Zwane Mwaikambo
-M:      zwane@arm.linux.org.uk
-L:      linux-sound@vger.kernel.org
-S:      Maintained
-
 OPROFILE
 P:      Philippe Elie
 M:      phil.el@wanadoo.fr
@@ -2832,11 +2870,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
@@ -2881,11 +2914,21 @@ L:	linux-kernel@vger.kernel.org
 S:      Maintained
 
 POSIX CLOCKS and TIMERS
-P:      George Anzinger
-M:      george@mvista.com
+P:      Thomas Gleixner
+M:      tglx@linutronix.de
 L:      linux-kernel@vger.kernel.org
 S:      Supported
 
+POWER SUPPLY CLASS/SUBSYSTEM and DRIVERS
+P:      Anton Vorontsov
+M:      cbou@mail.ru
+P:      David Woodhouse
+M:      dwmw2@infradead.org
+L:      linux-kernel@vger.kernel.org
+L:      kernel-discuss@handhelds.org
+T:      git git.infradead.org/battery-2.6.git
+S:      Maintained
+
 POWERPC 4xx EMAC DRIVER
 P:      Eugene Surovegin
 M:      ebs@ebshome.net
@@ -2921,6 +2964,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
@@ -2948,6 +2996,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
@@ -3067,6 +3122,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
@@ -3105,12 +3170,6 @@ M:	michael@mihu.de
 W:      http://www.mihu.de/linux/saa7146
 S:      Maintained
 
-SBPCD CDROM DRIVER
-P:      Eberhard Moenkeberg
-M:      emoenke@gwdg.de
-L:      linux-kernel@vger.kernel.org
-S:      Maintained
-
 SC1200 WDT DRIVER
 P:      Zwane Mwaikambo
 M:      zwane@arm.linux.org.uk
@@ -3299,9 +3358,19 @@ M:	neilb@suse.de
 L:      linux-raid@vger.kernel.org
 S:      Supported
 
-SOFTWARE SUSPEND:
+HIBERNATION (aka Software Suspend, aka swsusp):
 P:      Pavel Machek
 M:      pavel@suse.cz
+P:      Rafael J. Wysocki
+M:      rjw@sisk.pl
+L:      linux-pm@lists.linux-foundation.org
+S:      Supported
+
+SUSPEND TO RAM:
+P:      Pavel Machek
+M:      pavel@suse.cz
+P:      Rafael J. Wysocki
+M:      rjw@sisk.pl
 L:      linux-pm@lists.linux-foundation.org
 S:      Maintained
 
@@ -3737,12 +3806,12 @@ 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
@@ -4128,6 +4197,11 @@ W:	http://www.polyware.nl/~middelin/En/hobbies.html
 W:      http://www.polyware.nl/~middelin/hobbies.html
 S:      Maintained
 
+ZS DECSTATION Z85C30 SERIAL DRIVER
+P:      Maciej W. Rozycki
+M:      macro@linux-mips.org
+S:      Maintained
+
 THE REST
 P:      Linus Torvalds
 S:      Buried alive in reporters