1 files changed, 66 insertions, 50 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 0a32c3ec6b1c..2533fc45a44a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -410,9 +410,8 @@ F:	drivers/i2c/busses/i2c-ali1563.c
 
 ALPHA PORT
 M:      Richard Henderson <rth@twiddle.net>
-S:      Odd Fixes for 2.4; Maintained for 2.6.
 M:      Ivan Kokshaysky <ink@jurassic.park.msu.ru>
-S:      Maintained for 2.4; PCI support for 2.6.
+M:      Matt Turner <mattst88@gmail.com>
 L:      linux-alpha@vger.kernel.org
 F:      arch/alpha/
 
@@ -617,10 +616,10 @@ M:	Richard Purdie <rpurdie@rpsys.net>
 S:      Maintained
 
 ARM/CORTINA SYSTEMS GEMINI ARM ARCHITECTURE
-M:      Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
+M:      Paulius Zaleckas <paulius.zaleckas@gmail.com>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 T:      git git://gitorious.org/linux-gemini/mainline.git
-S:      Maintained
+S:      Odd Fixes
 F:      arch/arm/mach-gemini/
 
 ARM/EBSA110 MACHINE SUPPORT
@@ -642,9 +641,9 @@ T:	topgit git://git.openezx.org/openezx.git
 F:      arch/arm/mach-pxa/ezx.c
 
 ARM/FARADAY FA526 PORT
-M:      Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
+M:      Paulius Zaleckas <paulius.zaleckas@gmail.com>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-S:      Maintained
+S:      Odd Fixes
 F:      arch/arm/mm/*-fa*
 
 ARM/FOOTBRIDGE ARCHITECTURE
@@ -988,7 +987,6 @@ F:	drivers/platform/x86/asus-laptop.c
 
 ASYNCHRONOUS TRANSFERS/TRANSFORMS (IOAT) API
 M:      Dan Williams <dan.j.williams@intel.com>
-M:      Maciej Sosnowski <maciej.sosnowski@intel.com>
 W:      http://sourceforge.net/projects/xscaleiop
 S:      Supported
 F:      Documentation/crypto/async-tx-api.txt
@@ -1402,6 +1400,8 @@ L:	linux-usb@vger.kernel.org
 S:      Supported
 F:      Documentation/usb/WUSB-Design-overview.txt
 F:      Documentation/usb/wusb-cbaf
+F:      drivers/usb/host/hwa-hc.c
+F:      drivers/usb/host/whci/
 F:      drivers/usb/wusbcore/
 F:      include/linux/usb/wusb*
 
@@ -1470,6 +1470,12 @@ L:	linux-scsi@vger.kernel.org
 S:      Supported
 F:      drivers/scsi/fnic/
 
+CMPC ACPI DRIVER
+M:      Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
+M:      Daniel Oliveira Nascimento <don@syst.com.br>
+S:      Supported
+F:      drivers/platform/x86/classmate-laptop.c
+
 CODA FILE SYSTEM
 M:      Jan Harkes <jaharkes@cs.cmu.edu>
 M:      coda@cs.cmu.edu
@@ -1630,9 +1636,8 @@ S:	Maintained
 F:      sound/pci/cs5535audio/
 
 CX18 VIDEO4LINUX DRIVER
-M:      Hans Verkuil <hverkuil@xs4all.nl>
 M:      Andy Walls <awalls@radix.net>
-L:      ivtv-devel@ivtvdriver.org
+L:      ivtv-devel@ivtvdriver.org (moderated for non-subscribers)
 L:      linux-media@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 W:      http://linuxtv.org
@@ -1728,10 +1733,9 @@ F:	include/linux/tfrc.h
 F:      net/dccp/
 
 DECnet NETWORK LAYER
-M:      Christine Caulfield <christine.caulfield@googlemail.com>
 W:      http://linux-decnet.sourceforge.net
 L:      linux-decnet-user@lists.sourceforge.net
-S:      Maintained
+S:      Orphan
 F:      Documentation/networking/decnet.txt
 F:      net/decnet/
 
@@ -1817,7 +1821,6 @@ S:	Supported
 F:      fs/dlm/
 
 DMA GENERIC OFFLOAD ENGINE SUBSYSTEM
-M:      Maciej Sosnowski <maciej.sosnowski@intel.com>
 M:      Dan Williams <dan.j.williams@intel.com>
 S:      Supported
 F:      drivers/dma/
@@ -2161,10 +2164,9 @@ F:	drivers/hwmon/f75375s.c
 F:      include/linux/f75375s.h
 
 FIREWIRE SUBSYSTEM
-M:      Kristian Hoegsberg <krh@redhat.com>
 M:      Stefan Richter <stefanr@s5r6.in-berlin.de>
 L:      linux1394-devel@lists.sourceforge.net
-W:      http://www.linux1394.org/
+W:      http://ieee1394.wiki.kernel.org/
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git
 S:      Maintained
 F:      drivers/firewire/
@@ -2377,6 +2379,15 @@ W:	http://www.kernel.org/pub/linux/kernel/people/fseidel/hdaps/
 S:      Maintained
 F:      drivers/hwmon/hdaps.c
 
+HWPOISON MEMORY FAILURE HANDLING
+M:      Andi Kleen <andi@firstfloor.org>
+L:      linux-mm@kvack.org
+L:      linux-kernel@vger.kernel.org
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6.git hwpoison
+S:      Maintained
+F:      mm/memory-failure.c
+F:      mm/hwpoison-inject.c
+
 HYPERVISOR VIRTUAL CONSOLE DRIVER
 L:      linuxppc-dev@ozlabs.org
 S:      Odd Fixes
@@ -2688,22 +2699,14 @@ S:	Supported
 F:      drivers/idle/i7300_idle.c
 
 IEEE 1394 SUBSYSTEM
-M:      Ben Collins <ben.collins@ubuntu.com>
 M:      Stefan Richter <stefanr@s5r6.in-berlin.de>
 L:      linux1394-devel@lists.sourceforge.net
-W:      http://www.linux1394.org/
+W:      http://ieee1394.wiki.kernel.org/
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git
-S:      Maintained
+S:      Obsolete
 F:      Documentation/debugging-via-ohci1394.txt
 F:      drivers/ieee1394/
 
-IEEE 1394 RAW I/O DRIVER
-M:      Dan Dennedy <dan@dennedy.org>
-M:      Stefan Richter <stefanr@s5r6.in-berlin.de>
-L:      linux1394-devel@lists.sourceforge.net
-S:      Maintained
-F:      drivers/ieee1394/raw1394*
-
 IEEE 802.15.4 SUBSYSTEM
 M:      Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
 M:      Sergey Lapin <slapin@ossfans.org>
@@ -2780,7 +2783,7 @@ F:	arch/x86/kernel/microcode_core.c
 F:      arch/x86/kernel/microcode_intel.c
 
 INTEL I/OAT DMA DRIVER
-M:      Maciej Sosnowski <maciej.sosnowski@intel.com>
+M:      Dan Williams <dan.j.williams@intel.com>
 S:      Supported
 F:      drivers/dma/ioat*
 
@@ -2818,10 +2821,11 @@ L:	netdev@vger.kernel.org
 S:      Maintained
 F:      drivers/net/ixp2000/
 
-INTEL ETHERNET DRIVERS (e100/e1000/e1000e/igb/ixgb/ixgbe)
+INTEL ETHERNET DRIVERS (e100/e1000/e1000e/igb/igbvf/ixgb/ixgbe)
 M:      Jeff Kirsher <jeffrey.t.kirsher@intel.com>
 M:      Jesse Brandeburg <jesse.brandeburg@intel.com>
 M:      Bruce Allan <bruce.w.allan@intel.com>
+M:      Alex Duyck <alexander.h.duyck@intel.com>
 M:      PJ Waskiewicz <peter.p.waskiewicz.jr@intel.com>
 M:      John Ronciak <john.ronciak@intel.com>
 L:      e1000-devel@lists.sourceforge.net
@@ -2831,6 +2835,7 @@ F:	drivers/net/e100.c
 F:      drivers/net/e1000/
 F:      drivers/net/e1000e/
 F:      drivers/net/igb/
+F:      drivers/net/igbvf/
 F:      drivers/net/ixgb/
 F:      drivers/net/ixgbe/
 
@@ -3004,8 +3009,8 @@ S:	Maintained
 F:      drivers/isdn/hardware/eicon/
 
 IVTV VIDEO4LINUX DRIVER
-M:      Hans Verkuil <hverkuil@xs4all.nl>
-L:      ivtv-devel@ivtvdriver.org
+M:      Andy Walls <awalls@radix.net>
+L:      ivtv-devel@ivtvdriver.org (moderated for non-subscribers)
 L:      linux-media@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 W:      http://www.ivtvdriver.org
@@ -3405,8 +3410,10 @@ S:	Maintained
 F:      drivers/scsi/sym53c8xx_2/
 
 LTP (Linux Test Project)
-M:      Subrata Modak <subrata@linux.vnet.ibm.com>
-M:      Mike Frysinger <vapier@gentoo.org>
+M:      Rishikesh K Rajak <risrajak@linux.vnet.ibm.com>
+M:      Garrett Cooper <yanegomi@gmail.com>
+M:     Mike Frysinger <vapier@gentoo.org>
+M:     Subrata Modak <subrata@linux.vnet.ibm.com>
 L:      ltp-list@lists.sourceforge.net (subscribers-only)
 W:      http://ltp.sourceforge.net/
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/galak/ltp.git
@@ -3482,9 +3489,9 @@ S:	Maintained
 F:      drivers/net/wireless/libertas/
 
 MARVELL MV643XX ETHERNET DRIVER
-M:      Lennert Buytenhek <buytenh@marvell.com>
+M:      Lennert Buytenhek <buytenh@wantstofly.org>
 L:      netdev@vger.kernel.org
-S:      Supported
+S:      Maintained
 F:      drivers/net/mv643xx_eth.*
 F:      include/linux/mv643xx.h
 
@@ -3635,6 +3642,11 @@ W:	http://0pointer.de/lennart/tchibo.html
 S:      Maintained
 F:      drivers/platform/x86/msi-laptop.c
 
+MSI WMI SUPPORT
+M:      Anisse Astier <anisse@astier.eu>
+S:      Supported
+F:      drivers/platform/x86/msi-wmi.c
+
 MULTIFUNCTION DEVICES (MFD)
 M:      Samuel Ortiz <sameo@linux.intel.com>
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6.git
@@ -3668,7 +3680,7 @@ F:	include/linux/isicom.h
 MUSB MULTIPOINT HIGH SPEED DUAL-ROLE CONTROLLER
 M:      Felipe Balbi <felipe.balbi@nokia.com>
 L:      linux-usb@vger.kernel.org
-T:      git git://gitorious.org/musb/mainline.git
+T:      git git://gitorious.org/usb/usb.git
 S:      Maintained
 F:      drivers/usb/musb/
 
@@ -3825,6 +3837,7 @@ NETWORKING DRIVERS
 L:      netdev@vger.kernel.org
 W:      http://www.linuxfoundation.org/en/Net
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6.git
 S:      Odd Fixes
 F:      drivers/net/
 F:      include/linux/if_*
@@ -3860,7 +3873,7 @@ F:	drivers/net/ni5010.*
 
 NILFS2 FILESYSTEM
 M:      KONISHI Ryusuke <konishi.ryusuke@lab.ntt.co.jp>
-L:      users@nilfs.org
+L:      linux-nilfs@vger.kernel.org
 W:      http://www.nilfs.org/en/
 S:      Supported
 F:      Documentation/filesystems/nilfs2.txt
@@ -3927,29 +3940,20 @@ S:	Maintained
 F:      sound/soc/omap/
 
 OMAP FRAMEBUFFER SUPPORT
-M:      Imre Deak <imre.deak@nokia.com>
+M:      Tomi Valkeinen <tomi.valkeinen@nokia.com>
 L:      linux-fbdev@vger.kernel.org
 L:      linux-omap@vger.kernel.org
 S:      Maintained
 F:      drivers/video/omap/
 
-OMAP DISPLAY SUBSYSTEM SUPPORT (DSS2)
+OMAP DISPLAY SUBSYSTEM and FRAMEBUFFER SUPPORT (DSS2)
 M:      Tomi Valkeinen <tomi.valkeinen@nokia.com>
 L:      linux-omap@vger.kernel.org
-L:      linux-fbdev@vger.kernel.org (moderated for non-subscribers)
+L:      linux-fbdev@vger.kernel.org
 S:      Maintained
-F:      drivers/video/omap2/dss/
-F:      drivers/video/omap2/vrfb.c
-F:      drivers/video/omap2/vram.c
+F:      drivers/video/omap2/
 F:      Documentation/arm/OMAP/DSS
 
-OMAP FRAMEBUFFER SUPPORT (FOR DSS2)
-M:      Tomi Valkeinen <tomi.valkeinen@nokia.com>
-L:      linux-omap@vger.kernel.org
-L:      linux-fbdev@vger.kernel.org (moderated for non-subscribers)
-S:      Maintained
-F:      drivers/video/omap2/omapfb/
-
 OMAP MMC SUPPORT
 M:      Jarkko Lavinen <jarkko.lavinen@nokia.com>
 L:      linux-omap@vger.kernel.org
@@ -5421,10 +5425,19 @@ ULTRA-WIDEBAND (UWB) SUBSYSTEM:
 M:      David Vrabel <david.vrabel@csr.com>
 L:      linux-usb@vger.kernel.org
 S:      Supported
-F:      drivers/uwb/*
+F:      drivers/uwb/
+X:      drivers/uwb/wlp/
+X:      drivers/uwb/i1480/i1480u-wlp/
+X:      drivers/uwb/i1480/i1480-wlp.h
 F:      include/linux/uwb.h
 F:      include/linux/uwb/
 
+UNIFDEF
+M:      Tony Finch <dot@dotat.at>
+W:      http://dotat.at/prog/unifdef
+S:      Maintained
+F:      scripts/unifdef.c
+
 UNIFORM CDROM DRIVER
 M:      Jens Axboe <axboe@kernel.dk>
 W:      http://www.kernel.dk
@@ -5928,9 +5941,12 @@ W:	http://linuxwimax.org
 
 WIMEDIA LLC PROTOCOL (WLP) SUBSYSTEM
 M:      David Vrabel <david.vrabel@csr.com>
+L:      netdev@vger.kernel.org
 S:      Maintained
 F:      include/linux/wlp.h
 F:      drivers/uwb/wlp/
+F:      drivers/uwb/i1480/i1480u-wlp/
+F:      drivers/uwb/i1480/i1480-wlp.h
 
 WISTRON LAPTOP BUTTON DRIVER
 M:      Miloslav Trmac <mitr@volny.cz>
@@ -5991,9 +6007,9 @@ F:	sound/soc/codecs/wm8350.*
 F:      sound/soc/codecs/wm8400.*
 
 X.25 NETWORK LAYER
-M:      Henner Eisen <eis@baty.hanse.de>
+M:      Andrew Hendry <andrew.hendry@gmail.com>
 L:      linux-x25@vger.kernel.org
-S:      Maintained
+S:      Odd Fixes
 F:      Documentation/networking/x25*
 F:      include/net/x25*
 F:      net/x25/