1 files changed, 81 insertions, 12 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index b49ba9a43bf8..af58f0b01450 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -405,7 +405,7 @@ S:	Supported
 F:      drivers/usb/gadget/amd5536udc.*
 
 AMD GEODE PROCESSOR/CHIPSET SUPPORT
-P:      Jordan Crouse
+P:      Andres Salomon <dilinger@queued.net>
 L:      linux-geode@lists.infradead.org (moderated for non-subscribers)
 W:      http://www.amd.com/us-en/ConnectivitySolutions/TechnicalResources/0,,50_2334_2452_11363,00.html
 S:      Supported
@@ -559,14 +559,14 @@ W:	http://maxim.org.za/at91_26.html
 S:      Maintained
 
 ARM/BCMRING ARM ARCHITECTURE
-M:      Leo Chen <leochen@broadcom.com>
+M:      Jiandong Zheng <jdzheng@broadcom.com>
 M:      Scott Branden <sbranden@broadcom.com>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
 F:      arch/arm/mach-bcmring
 
 ARM/BCMRING MTD NAND DRIVER
-M:      Leo Chen <leochen@broadcom.com>
+M:      Jiandong Zheng <jdzheng@broadcom.com>
 M:      Scott Branden <sbranden@broadcom.com>
 L:      linux-mtd@lists.infradead.org
 S:      Maintained
@@ -792,11 +792,14 @@ S:	Maintained
 
 ARM/NOMADIK ARCHITECTURE
 M:      Alessandro Rubini <rubini@unipv.it>
+M:      Linus Walleij <linus.walleij@stericsson.com>
 M:      STEricsson <STEricsson_nomadik_linux@list.st.com>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
 F:      arch/arm/mach-nomadik/
 F:      arch/arm/plat-nomadik/
+F:      drivers/i2c/busses/i2c-nomadik.c
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git
 
 ARM/OPENMOKO NEO FREERUNNER (GTA02) MACHINE SUPPORT
 M:      Nelson Castillo <arhuaco@freaks-unidos.net>
@@ -815,7 +818,7 @@ 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
+T:      git git://codeaurora.org/quic/kernel/davidb/linux-msm.git
 S:      Maintained
 
 ARM/TOSA MACHINE SUPPORT
@@ -998,12 +1001,24 @@ F:	drivers/i2c/busses/i2c-stu300.c
 F:      drivers/rtc/rtc-coh901331.c
 F:      drivers/watchdog/coh901327_wdt.c
 F:      drivers/dma/coh901318*
+F:      drivers/mfd/ab3100*
+F:      drivers/rtc/rtc-ab3100.c
+F:      drivers/rtc/rtc-coh901331.c
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git
 
-ARM/U8500 ARM ARCHITECTURE
+ARM/Ux500 ARM ARCHITECTURE
 M:      Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
+M:      Linus Walleij <linus.walleij@stericsson.com>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
 F:      arch/arm/mach-ux500/
+F:      drivers/dma/ste_dma40*
+F:      drivers/mfd/ab3550*
+F:      drivers/mfd/abx500*
+F:      drivers/mfd/ab8500*
+F:      drivers/mfd/stmpe*
+F:      drivers/rtc/rtc-ab8500.c
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git
 
 ARM/VFP SUPPORT
 M:      Russell King <linux@arm.linux.org.uk>
@@ -1419,6 +1434,14 @@ S:	Supported
 F:      block/bsg.c
 F:      include/linux/bsg.h
 
+BT87X AUDIO DRIVER
+M:      Clemens Ladisch <clemens@ladisch.de>
+L:      alsa-devel@alsa-project.org (moderated for non-subscribers)
+T:      git git://git.alsa-project.org/alsa-kernel.git
+S:      Maintained
+F:      Documentation/sound/alsa/Bt87x.txt
+F:      sound/pci/bt87x.c
+
 BT8XXGPIO DRIVER
 M:      Michael Buesch <mb@bu3sch.de>
 W:      http://bu3sch.de/btgpio.php
@@ -1444,6 +1467,13 @@ S:	Maintained
 F:      Documentation/video4linux/bttv/
 F:      drivers/media/video/bt8xx/bttv*
 
+C-MEDIA CMI8788 DRIVER
+M:      Clemens Ladisch <clemens@ladisch.de>
+L:      alsa-devel@alsa-project.org (moderated for non-subscribers)
+T:      git git://git.alsa-project.org/alsa-kernel.git
+S:      Maintained
+F:      sound/pci/oxygen/
+
 CACHEFILES: FS-CACHE BACKEND FOR CACHING ON MOUNTED FILESYSTEMS
 M:      David Howells <dhowells@redhat.com>
 L:      linux-cachefs@redhat.com
@@ -2060,7 +2090,7 @@ F:	Documentation/blockdev/drbd/
 
 DRIVER CORE, KOBJECTS, DEBUGFS AND SYSFS
 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/driver-core-2.6.git
 S:      Supported
 F:      Documentation/kobject.txt
 F:      drivers/base/
@@ -2080,7 +2110,7 @@ F:	include/drm/
 
 INTEL DRM DRIVERS (excluding Poulsbo, Moorestown and derivative chipsets)
 M:      Chris Wilson <chris@chris-wilson.co.uk>
-L:      intel-gfx@lists.freedesktop.org
+L:      intel-gfx@lists.freedesktop.org (subscribers-only)
 L:      dri-devel@lists.freedesktop.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel.git
 S:      Supported
@@ -2234,6 +2264,13 @@ W:	bluesmoke.sourceforge.net
 S:      Maintained
 F:      drivers/edac/r82600_edac.c
 
+EDIROL UA-101/UA-1000 DRIVER
+M:      Clemens Ladisch <clemens@ladisch.de>
+L:      alsa-devel@alsa-project.org (moderated for non-subscribers)
+T:      git git://git.alsa-project.org/alsa-kernel.git
+S:      Maintained
+F:      sound/usb/misc/ua101.c
+
 EEEPC LAPTOP EXTRAS DRIVER
 M:      Corentin Chary <corentincj@iksaif.net>
 L:      acpi4asus-user@lists.sourceforge.net
@@ -2444,10 +2481,12 @@ F:	drivers/net/wan/sdla.c
 FRAMEBUFFER LAYER
 L:      linux-fbdev@vger.kernel.org
 W:      http://linux-fbdev.sourceforge.net/
+Q:      http://patchwork.kernel.org/project/linux-fbdev/list/
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6.git
 S:      Orphan
 F:      Documentation/fb/
-F:      drivers/video/fb*
+F:      drivers/video/
+F:      include/video/
 F:      include/linux/fb.h
 
 FREESCALE DMA DRIVER
@@ -3376,6 +3415,13 @@ L:	linux-serial@vger.kernel.org
 S:      Maintained
 F:      drivers/serial/jsm/
 
+K10TEMP HARDWARE MONITORING DRIVER
+M:      Clemens Ladisch <clemens@ladisch.de>
+L:      lm-sensors@lm-sensors.org
+S:      Maintained
+F:      Documentation/hwmon/k10temp
+F:      drivers/hwmon/k10temp.c
+
 K8TEMP HARDWARE MONITORING DRIVER
 M:      Rudolf Marek <r.marek@assembler.cz>
 L:      lm-sensors@lm-sensors.org
@@ -4062,9 +4108,8 @@ F:	drivers/scsi/NCR_D700.*
 
 NETEFFECT IWARP RNIC DRIVER (IW_NES)
 M:      Faisal Latif <faisal.latif@intel.com>
-M:      Chien Tung <chien.tin.tung@intel.com>
 L:      linux-rdma@vger.kernel.org
-W:      http://www.neteffect.com
+W:      http://www.intel.com/Products/Server/Adapters/Server-Cluster/Server-Cluster-overview.htm
 S:      Supported
 F:      drivers/infiniband/hw/nes/
 
@@ -4393,6 +4438,13 @@ F:	drivers/of
 F:      include/linux/of*.h
 K:      of_get_property
 
+OPL4 DRIVER
+M:      Clemens Ladisch <clemens@ladisch.de>
+L:      alsa-devel@alsa-project.org (moderated for non-subscribers)
+T:      git git://git.alsa-project.org/alsa-kernel.git
+S:      Maintained
+F:      sound/drivers/opl4/
+
 OPROFILE
 M:      Robert Richter <robert.richter@amd.com>
 L:      oprofile-list@lists.sf.net
@@ -4589,7 +4641,7 @@ F:	drivers/pcmcia/
 F:      include/pcmcia/
 
 PCNET32 NETWORK DRIVER
-M:      Don Fry <pcnet32@verizon.net>
+M:      Don Fry <pcnet32@frontier.com>
 L:      netdev@vger.kernel.org
 S:      Maintained
 F:      drivers/net/pcnet32.c
@@ -5837,6 +5889,8 @@ M:	Chris Metcalf <cmetcalf@tilera.com>
 W:      http://www.tilera.com/scm/
 S:      Supported
 F:      arch/tile/
+F:      drivers/char/hvc_tile.c
+F:      drivers/net/tile/
 
 TLAN NETWORK DRIVER
 M:      Samuel Chessman <chessman@tux.org>
@@ -5929,7 +5983,6 @@ F:	include/linux/tty.h
 
 TULIP NETWORK DRIVERS
 M:      Grant Grundler <grundler@parisc-linux.org>
-M:      Kyle McMartin <kyle@mcmartin.ca>
 L:      netdev@vger.kernel.org
 S:      Maintained
 F:      drivers/net/tulip/
@@ -6124,6 +6177,13 @@ S:	Maintained
 W:      http://www.one-eyed-alien.net/~mdharm/linux-usb/
 F:      drivers/usb/storage/
 
+USB MIDI DRIVER
+M:      Clemens Ladisch <clemens@ladisch.de>
+L:      alsa-devel@alsa-project.org (moderated for non-subscribers)
+T:      git git://git.alsa-project.org/alsa-kernel.git
+S:      Maintained
+F:      sound/usb/midi.*
+
 USB OHCI DRIVER
 M:      David Brownell <dbrownell@users.sourceforge.net>
 L:      linux-usb@vger.kernel.org
@@ -6581,6 +6641,15 @@ F:	include/linux/mfd/wm8400*
 F:      include/sound/wm????.h
 F:      sound/soc/codecs/wm*
 
+WORKQUEUE
+M:      Tejun Heo <tj@kernel.org>
+L:      linux-kernel@vger.kernel.org
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git
+S:      Maintained
+F:      include/linux/workqueue.h
+F:      kernel/workqueue.c
+F:      Documentation/workqueue.txt
+
 X.25 NETWORK LAYER
 M:      Andrew Hendry <andrew.hendry@gmail.com>
 L:      linux-x25@vger.kernel.org