Merge tag 'sound-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

[linux-beck.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index a8e6098559957562279128a00154895617e51755..61dd168d349ac5ad1c6ac921174c840faa2c7e15 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2912,7 +2912,7 @@ S:        Maintained
 F:     arch/frv/
 
 FUJITSU LAPTOP EXTRAS
-M:     Jonathan Woithe <jwoithe@physics.adelaide.edu.au>
+M:     Jonathan Woithe <jwoithe@just42.net>
 L:     platform-driver-x86@vger.kernel.org
 S:     Maintained
 F:     drivers/platform/x86/fujitsu-laptop.c
@@ -3406,6 +3406,7 @@ IIO SUBSYSTEM AND DRIVERS
 M:     Jonathan Cameron <jic23@cam.ac.uk>
 L:     linux-iio@vger.kernel.org
 S:     Maintained
+F:     drivers/iio/
 F:     drivers/staging/iio/
 
 IKANOS/ADI EAGLE ADSL USB DRIVER
@@ -3625,6 +3626,14 @@ S:       Supported
 W:     http://wireless.kernel.org/en/users/Drivers/iwmc3200wifi
 F:     drivers/net/wireless/iwmc3200wifi/
 
+INTEL MANAGEMENT ENGINE (mei)
+M:     Tomas Winkler <tomas.winkler@intel.com>
+L:     linux-kernel@vger.kernel.org
+S:     Supported
+F:     include/linux/mei.h
+F:     drivers/misc/mei/*
+F:     Documentation/mei/*
+
 IOC3 ETHERNET DRIVER
 M:     Ralf Baechle <ralf@linux-mips.org>
 L:     linux-mips@linux-mips.org
@@ -6564,7 +6573,7 @@ M:        Paul Mundt <lethal@linux-sh.org>
 L:     linux-sh@vger.kernel.org
 W:     http://www.linux-sh.org
 Q:     http://patchwork.kernel.org/project/linux-sh/list/
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git sh-latest
+T:     git git://github.com/pmundt/linux-sh.git sh-latest
 S:     Supported
 F:     Documentation/sh/
 F:     arch/sh/
@@ -6682,6 +6691,12 @@ F:       drivers/misc/tifm*
 F:     drivers/mmc/host/tifm_sd.c
 F:     include/linux/tifm.h
 
+TI LM49xxx FAMILY ASoC CODEC DRIVERS
+M:     M R Swami Reddy <mr.swami.reddy@ti.com>
+L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
+S:     Maintained
+F:     sound/soc/codecs/lm49453*
+
 TI TWL4030 SERIES SOC CODEC DRIVER
 M:     Peter Ujfalusi <peter.ujfalusi@ti.com>
 L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
@@ -7350,6 +7365,18 @@ S:       Maintained
 F:     drivers/vlynq/vlynq.c
 F:     include/linux/vlynq.h
 
+VME SUBSYSTEM
+M:     Martyn Welch <martyn.welch@ge.com>
+M:     Manohar Vanga <manohar.vanga@cern.ch>
+M:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+L:     devel@driverdev.osuosl.org
+S:     Maintained
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git
+F:     Documentation/vme_api.txt
+F:     drivers/staging/vme/
+F:     drivers/vme/
+F:     include/linux/vme*
+
 VMWARE VMXNET3 ETHERNET DRIVER
 M:     Shreyas Bhatewara <sbhatewara@vmware.com>
 M:     "VMware, Inc." <pv-drivers@vmware.com>