1 files changed, 48 insertions, 7 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index fd05bb773494..2e14fd74d48c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1523,6 +1523,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
@@ -1548,6 +1556,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
@@ -2339,6 +2354,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
@@ -3507,6 +3529,13 @@ L:	linux-serial@vger.kernel.org
 S:      Maintained
 F:      drivers/tty/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
@@ -3655,7 +3684,7 @@ F:	kernel/debug/
 
 KMEMCHECK
 M:      Vegard Nossum <vegardno@ifi.uio.no>
-M:      Pekka Enberg <penberg@cs.helsinki.fi>
+M:      Pekka Enberg <penberg@kernel.org>
 S:      Maintained
 F:      Documentation/kmemcheck.txt
 F:      arch/x86/include/asm/kmemcheck.h
@@ -4537,6 +4566,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
@@ -5236,8 +5272,7 @@ S:	Supported
 F:      drivers/s390/net/
 
 S390 ZCRYPT DRIVER
-M:      Felix Beck <felix.beck@de.ibm.com>
-M:      Ralph Wuerthner <ralph.wuerthner@de.ibm.com>
+M:      Holger Dengler <hd@linux.vnet.ibm.com>
 M:      linux390@de.ibm.com
 L:      linux-s390@vger.kernel.org
 W:      http://www.ibm.com/developerworks/linux/linux390/
@@ -5283,7 +5318,7 @@ SAMSUNG AUDIO (ASoC) DRIVERS
 M:      Jassi Brar <jassi.brar@samsung.com>
 L:      alsa-devel@alsa-project.org (moderated for non-subscribers)
 S:      Supported
-F:      sound/soc/s3c24xx
+F:      sound/soc/samsung
 
 TIMEKEEPING, NTP
 M:      John Stultz <johnstul@us.ibm.com>
@@ -5611,7 +5646,7 @@ F:	drivers/net/sky2.*
 
 SLAB ALLOCATOR
 M:      Christoph Lameter <cl@linux-foundation.org>
-M:      Pekka Enberg <penberg@cs.helsinki.fi>
+M:      Pekka Enberg <penberg@kernel.org>
 M:      Matt Mackall <mpm@selenic.com>
 L:      linux-mm@kvack.org
 S:      Maintained
@@ -6291,6 +6326,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
@@ -6549,13 +6591,12 @@ F:	Documentation/i2c/busses/i2c-viapro
 F:      drivers/i2c/busses/i2c-viapro.c
 
 VIA SD/MMC CARD CONTROLLER DRIVER
-M:      Joseph Chan <JosephChan@via.com.tw>
+M:      Bruce Chang <brucechang@via.com.tw>
 M:      Harald Welte <HaraldWelte@viatech.com>
 S:      Maintained
 F:      drivers/mmc/host/via-sdmmc.c
 
 VIA UNICHROME(PRO)/CHROME9 FRAMEBUFFER DRIVER
-M:      Joseph Chan <JosephChan@via.com.tw>
 M:      Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
 L:      linux-fbdev@vger.kernel.org
 S:      Maintained