aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-10-11 13:02:57 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-11 13:02:57 -0400
commit58d79e7141e4f5e4006089eabeec0eadef6e409e (patch)
treeb6c62e6ea00b20bb103edc2a90558cd225e7dad1 /MAINTAINERS
parent85a331881dd52a93e7d4c57bcaf5486cc8718465 (diff)
parentdd4025bdb6c731b6cd23f97797ef6d8dbfeb9e9d (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ALSA: hda - Add another HP DV6 quirk OSS: soundcard: locking bug in sound_ioctl() ASoC: Update links for Wolfson MAINTAINERS entry ASoC: Add Dimitris Papastamos to Wolfson maintainers ASoC: Add Jassi Brar as Samsung maintainer
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS10
1 files changed, 9 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index d45828145e3a..7679bf32f7bb 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5030,6 +5030,12 @@ F: drivers/media/common/saa7146*
5030F: drivers/media/video/*7146* 5030F: drivers/media/video/*7146*
5031F: include/media/*7146* 5031F: include/media/*7146*
5032 5032
5033SAMSUNG AUDIO (ASoC) DRIVERS
5034M: Jassi Brar <jassi.brar@samsung.com>
5035L: alsa-devel@alsa-project.org (moderated for non-subscribers)
5036S: Supported
5037F: sound/soc/s3c24xx
5038
5033TLG2300 VIDEO4LINUX-2 DRIVER 5039TLG2300 VIDEO4LINUX-2 DRIVER
5034M: Huang Shijie <shijie8@gmail.com> 5040M: Huang Shijie <shijie8@gmail.com>
5035M: Kang Yong <kangyong@telegent.com> 5041M: Kang Yong <kangyong@telegent.com>
@@ -6472,8 +6478,10 @@ F: include/linux/wm97xx.h
6472WOLFSON MICROELECTRONICS DRIVERS 6478WOLFSON MICROELECTRONICS DRIVERS
6473M: Mark Brown <broonie@opensource.wolfsonmicro.com> 6479M: Mark Brown <broonie@opensource.wolfsonmicro.com>
6474M: Ian Lartey <ian@opensource.wolfsonmicro.com> 6480M: Ian Lartey <ian@opensource.wolfsonmicro.com>
6481M: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
6482T: git git://opensource.wolfsonmicro.com/linux-2.6-asoc
6475T: git git://opensource.wolfsonmicro.com/linux-2.6-audioplus 6483T: git git://opensource.wolfsonmicro.com/linux-2.6-audioplus
6476W: http://opensource.wolfsonmicro.com/node/8 6484W: http://opensource.wolfsonmicro.com/content/linux-drivers-wolfson-devices
6477S: Supported 6485S: Supported
6478F: Documentation/hwmon/wm83?? 6486F: Documentation/hwmon/wm83??
6479F: drivers/leds/leds-wm83*.c 6487F: drivers/leds/leds-wm83*.c