summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-10-11 16:36:25 +0400
committerTakashi Iwai <tiwai@suse.de>2010-10-11 16:36:25 +0400
commitdd4025bdb6c731b6cd23f97797ef6d8dbfeb9e9d (patch)
tree17bfc0704fbee2d369ba9b6e958635eb0d74ca54
parent9b2167d59f38691b86430ce559c7fa9d4f973b1f (diff)
parentcf8eda3ef0039911557a3c11f1f18f9ce2d3c323 (diff)
downloadlinux-dd4025bdb6c731b6cd23f97797ef6d8dbfeb9e9d.tar.xz
Merge branch 'fix/asoc' into for-linus
-rw-r--r--MAINTAINERS10
1 files changed, 9 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index f46d8e66333f..d41d59e6b261 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5008,6 +5008,12 @@ F: drivers/media/common/saa7146*
F: drivers/media/video/*7146*
F: include/media/*7146*
+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
+
TLG2300 VIDEO4LINUX-2 DRIVER
M: Huang Shijie <shijie8@gmail.com>
M: Kang Yong <kangyong@telegent.com>
@@ -6450,8 +6456,10 @@ F: include/linux/wm97xx.h
WOLFSON MICROELECTRONICS DRIVERS
M: Mark Brown <broonie@opensource.wolfsonmicro.com>
M: Ian Lartey <ian@opensource.wolfsonmicro.com>
+M: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
+T: git git://opensource.wolfsonmicro.com/linux-2.6-asoc
T: git git://opensource.wolfsonmicro.com/linux-2.6-audioplus
-W: http://opensource.wolfsonmicro.com/node/8
+W: http://opensource.wolfsonmicro.com/content/linux-drivers-wolfson-devices
S: Supported
F: Documentation/hwmon/wm83??
F: drivers/leds/leds-wm83*.c