diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-11 20:45:42 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-11 20:45:42 -0500 |
commit | fe10e6f4b24ef8ca12cb4d2368deb4861ab1861b (patch) | |
tree | 86f524927ce64b07b3ab18254558e7fa766b0688 /MAINTAINERS | |
parent | f28ad3b44a03892b533cfb503273370033594d9d (diff) | |
parent | d938e66003c9ccc6c0ab10fa31ee23cf27574d66 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
ALSA: usb-audio: Use kmemdup rather than duplicating its implementation
ALSA: hda - Re-enable the check NO_PRESENCE misc bit
ALSA: vmaster - Free slave-links when freeing the master element
ALSA: hda - Don't add elements of other codecs to vmaster slave
ALSA: intel8x0: improve virtual environment detection
ALSA: intel8x0: move virtual environment detection code into one place
ALSA: snd_usb_audio: add Logitech HD Webcam c510 to quirk-384
ALSA: hda - fix internal mic on Dell Vostro 3500 laptop
ALSA: HDA: Remove quirk for Toshiba T110
ALSA: usb-audio - Fix the missing volume quirks at delayed init
ALSA: hda - Mute unused capture sources for Realtek codecs
ALSA: intel8x0: Improve comments for VM optimization
ASoC: Ensure we get an impedence reported for WM8958 jack detect
ASoC: Don't use wm8994->control_data when requesting IRQs
ASoC: Don't use wm8994->control_data in wm8994_readable_register()
ASoC: Update git repository URL
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index c1b1f3e40c38..3e8bc6163be6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -6129,7 +6129,7 @@ F: sound/ | |||
6129 | SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC) | 6129 | SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC) |
6130 | M: Liam Girdwood <lrg@ti.com> | 6130 | M: Liam Girdwood <lrg@ti.com> |
6131 | M: Mark Brown <broonie@opensource.wolfsonmicro.com> | 6131 | M: Mark Brown <broonie@opensource.wolfsonmicro.com> |
6132 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git | 6132 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git |
6133 | L: alsa-devel@alsa-project.org (moderated for non-subscribers) | 6133 | L: alsa-devel@alsa-project.org (moderated for non-subscribers) |
6134 | W: http://alsa-project.org/main/index.php/ASoC | 6134 | W: http://alsa-project.org/main/index.php/ASoC |
6135 | S: Supported | 6135 | S: Supported |