diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-11 10:02:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-11 10:02:57 -0700 |
| commit | 58d79e7141e4f5e4006089eabeec0eadef6e409e (patch) | |
| tree | b6c62e6ea00b20bb103edc2a90558cd225e7dad1 /MAINTAINERS | |
| parent | 85a331881dd52a93e7d4c57bcaf5486cc8718465 (diff) | |
| parent | dd4025bdb6c731b6cd23f97797ef6d8dbfeb9e9d (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-- | MAINTAINERS | 10 |
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* 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> @@ -6472,8 +6478,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 |