1 files changed, 90 insertions, 44 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index ef40d2c3e55b..4067c2e50d48 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/
 
@@ -801,6 +800,19 @@ L:	openmoko-kernel@lists.openmoko.org (subscribers-only)
 W:      http://wiki.openmoko.org/wiki/Neo_FreeRunner
 S:      Supported
 
+ARM/QUALCOMM MSM MACHINE SUPPORT
+M:      David Brown <davidb@codeaurora.org>
+M:      Daniel Walker <dwalker@codeaurora.org>
+M:      Bryan Huntsman <bryanh@codeaurora.org>
+F:      arch/arm/mach-msm/
+F:      drivers/video/msm/
+F:      drivers/mmc/host/msm_sdcc.c
+F:      drivers/mmc/host/msm_sdcc.h
+F:      drivers/serial/msm_serial.h
+F:      drivers/serial/msm_serial.c
+T:      git git://codeaurora.org/quic/kernel/dwalker/linux-msm.git
+S:      Maintained
+
 ARM/TOSA MACHINE SUPPORT
 M:      Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
 M:      Dirk Opfer <dirk@opfer-online.de>
@@ -822,13 +834,13 @@ F:	arch/arm/mach-pxa/palmte2.c
 F:      arch/arm/mach-pxa/include/mach/palmtc.h
 F:      arch/arm/mach-pxa/palmtc.c
 
-ARM/PALM TREO 680 SUPPORT
+ARM/PALM TREO SUPPORT
 M:      Tomas Cech <sleep_walker@suse.cz>
 L:      linux-arm-kernel@lists.infradead.org
 W:      http://hackndev.com
 S:      Maintained
-F:      arch/arm/mach-pxa/include/mach/treo680.h
-F:      arch/arm/mach-pxa/treo680.c
+F:      arch/arm/mach-pxa/include/mach/palmtreo.h
+F:      arch/arm/mach-pxa/palmtreo.c
 
 ARM/PALMZ72 SUPPORT
 M:      Sergey Lapin <slapin@ossfans.org>
@@ -1388,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*
 
@@ -1456,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
@@ -1468,8 +1488,8 @@ F:	include/linux/coda*.h
 
 COMMON INTERNET FILE SYSTEM (CIFS)
 M:      Steve French <sfrench@samba.org>
-L:      linux-cifs-client@lists.samba.org
-L:      samba-technical@lists.samba.org
+L:      linux-cifs-client@lists.samba.org (moderated for non-subscribers)
+L:      samba-technical@lists.samba.org (moderated for non-subscribers)
 W:      http://linux-cifs.samba.org/
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git
 S:      Supported
@@ -1616,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
@@ -2146,10 +2165,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/
@@ -2362,6 +2380,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
@@ -2673,22 +2700,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>
@@ -2989,8 +3008,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
@@ -3066,8 +3085,11 @@ S:	Maintained
 F:      fs/autofs4/
 
 KERNEL BUILD
+M:      Michal Marek <mmarek@suse.cz>
+T:      git git://repo.or.cz/linux-kbuild.git for-next
+T:      git git://repo.or.cz/linux-kbuild.git for-linus
 L:      linux-kbuild@vger.kernel.org
-S:      Orphan
+S:      Maintained
 F:      Documentation/kbuild/
 F:      Makefile
 F:      scripts/Makefile.*
@@ -3109,7 +3131,6 @@ L:	kvm@vger.kernel.org
 W:      http://kvm.qumranet.com
 S:      Supported
 F:      arch/x86/include/asm/svm.h
-F:      arch/x86/kvm/kvm_svm.h
 F:      arch/x86/kvm/svm.c
 
 KERNEL VIRTUAL MACHINE (KVM) FOR POWERPC
@@ -3245,6 +3266,7 @@ LINUX FOR IBM pSERIES (RS/6000)
 M:      Paul Mackerras <paulus@au.ibm.com>
 W:      http://www.ibm.com/linux/ltc/projects/ppc
 S:      Supported
+F:      arch/powerpc/boot/rs6000.h
 
 LINUX FOR POWERPC (32-BIT AND 64-BIT)
 M:      Benjamin Herrenschmidt <benh@kernel.crashing.org>
@@ -3253,18 +3275,24 @@ W:	http://www.penguinppc.org/
 L:      linuxppc-dev@ozlabs.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git
 S:      Supported
+F:      Documentation/powerpc/
+F:      arch/powerpc/
 
 LINUX FOR POWER MACINTOSH
 M:      Benjamin Herrenschmidt <benh@kernel.crashing.org>
 W:      http://www.penguinppc.org/
 L:      linuxppc-dev@ozlabs.org
 S:      Maintained
+F:      arch/powerpc/platforms/powermac/
+F:      drivers/macintosh/
 
 LINUX FOR POWERPC EMBEDDED MPC5XXX
 M:      Grant Likely <grant.likely@secretlab.ca>
 L:      linuxppc-dev@ozlabs.org
 T:      git git://git.secretlab.ca/git/linux-2.6.git
 S:      Maintained
+F:      arch/powerpc/platforms/512x/
+F:      arch/powerpc/platforms/52xx/
 
 LINUX FOR POWERPC EMBEDDED PPC4XX
 M:      Josh Boyer <jwboyer@linux.vnet.ibm.com>
@@ -3273,6 +3301,8 @@ W:	http://www.penguinppc.org/
 L:      linuxppc-dev@ozlabs.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git
 S:      Maintained
+F:      arch/powerpc/platforms/40x/
+F:      arch/powerpc/platforms/44x/
 
 LINUX FOR POWERPC EMBEDDED XILINX VIRTEX
 M:      Grant Likely <grant.likely@secretlab.ca>
@@ -3280,6 +3310,8 @@ W:	http://wiki.secretlab.ca/index.php/Linux_on_Xilinx_Virtex
 L:      linuxppc-dev@ozlabs.org
 T:      git git://git.secretlab.ca/git/linux-2.6.git
 S:      Maintained
+F:      arch/powerpc/*/*virtex*
+F:      arch/powerpc/*/*/*virtex*
 
 LINUX FOR POWERPC EMBEDDED PPC8XX
 M:      Vitaly Bordug <vitb@kernel.crashing.org>
@@ -3293,12 +3325,16 @@ M:	Kumar Gala <galak@kernel.crashing.org>
 W:      http://www.penguinppc.org/
 L:      linuxppc-dev@ozlabs.org
 S:      Maintained
+F:      arch/powerpc/platforms/83xx/
 
 LINUX FOR POWERPC PA SEMI PWRFICIENT
 M:      Olof Johansson <olof@lixom.net>
 W:      http://www.pasemi.com/
 L:      linuxppc-dev@ozlabs.org
 S:      Supported
+F:      arch/powerpc/platforms/pasemi/
+F:      drivers/*/*pasemi*
+F:      drivers/*/*/*pasemi*
 
 LINUX SECURITY MODULE (LSM) FRAMEWORK
 M:      Chris Wright <chrisw@sous-sol.org>
@@ -3603,6 +3639,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
@@ -3636,7 +3677,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/
 
@@ -3828,7 +3869,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
@@ -3895,29 +3936,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
@@ -5050,6 +5082,7 @@ F:	drivers/char/specialix*
 
 SPI SUBSYSTEM
 M:      David Brownell <dbrownell@users.sourceforge.net>
+M:      Grant Likely <grant.likely@secretlab.ca>
 L:      spi-devel-general@lists.sourceforge.net
 S:      Maintained
 F:      Documentation/spi/
@@ -5388,10 +5421,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
@@ -5895,9 +5937,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>
@@ -5943,6 +5988,7 @@ M:	Mark Brown <broonie@opensource.wolfsonmicro.com>
 T:      git git://opensource.wolfsonmicro.com/linux-2.6-audioplus
 W:      http://opensource.wolfsonmicro.com/node/8
 S:      Supported
+F:      Documentation/hwmon/wm83??
 F:      drivers/leds/leds-wm83*.c
 F:      drivers/mfd/wm8*.c
 F:      drivers/power/wm83*.c
@@ -5952,9 +5998,9 @@ F:	drivers/video/backlight/wm83*_bl.c
 F:      drivers/watchdog/wm83*_wdt.c
 F:      include/linux/mfd/wm831x/
 F:      include/linux/mfd/wm8350/
-F:      include/linux/mfd/wm8400/
-F:      sound/soc/codecs/wm8350.c
-F:      sound/soc/codecs/wm8400.c
+F:      include/linux/mfd/wm8400*
+F:      sound/soc/codecs/wm8350.*
+F:      sound/soc/codecs/wm8400.*
 
 X.25 NETWORK LAYER
 M:      Andrew Hendry <andrew.hendry@gmail.com>