diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-22 17:59:07 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-22 17:59:07 -0400 |
| commit | 8d082f8f3fb89e8a1fcb5120ad98cd9860c8a3e8 (patch) | |
| tree | 5b3865764bee4511d76248b9eaf5cf166557691d /MAINTAINERS | |
| parent | 258ba6a5a9194ea043850f77d1219053c810e043 (diff) | |
| parent | 6a9a6f233baad76b67a448b39bb55fc064755ba4 (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 - Fix unused warnings when !SND_HDA_NEEDS_RESUME
ALSA: hda - Add a fix-up for Acer dmic with ALC271x codec
ASoC: add a module alias to the FSI driver
ALSA: emu10k1 - Fix "Music" controls to "Synth" controls in documents
ARM: s3c2440: gta02; Register dfbmcs320 device for BT audio interface
ASoC: codecs: JZ4740: Fix OOPS
ASoC: Fix output PGA enabling in wm_hubs CODECs
ASoC: sn95031: decorate function with __devexit_p()
ASoC: SAMSUNG: Fix the inverted clocks handling for pcm driver
ASoC: sst_platform: Fix lock acquring
ASoC: fsi: driver safely remove for against irq
ASoC: fsi: modify vague PM control on probe
ASoC: fsi: take care in failing case of dai register
MAINTAINERS: Update Samsung ASoC maintainer's id
ASoC: WM8903: HP and Line out PGA/mixer DAPM fixes
ASoC: Set left channel volume update bits for WM8994
ASoC: fix config error path
ASoC: check channel mismatch between cpu_dai and codec_dai
ASoC: Tegra: Suspend/resume support
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 1e2724e55cf0..13803127b68f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -5396,7 +5396,7 @@ F: drivers/media/video/*7146* | |||
| 5396 | F: include/media/*7146* | 5396 | F: include/media/*7146* |
| 5397 | 5397 | ||
| 5398 | SAMSUNG AUDIO (ASoC) DRIVERS | 5398 | SAMSUNG AUDIO (ASoC) DRIVERS |
| 5399 | M: Jassi Brar <jassi.brar@samsung.com> | 5399 | M: Jassi Brar <jassisinghbrar@gmail.com> |
| 5400 | L: alsa-devel@alsa-project.org (moderated for non-subscribers) | 5400 | L: alsa-devel@alsa-project.org (moderated for non-subscribers) |
| 5401 | S: Supported | 5401 | S: Supported |
| 5402 | F: sound/soc/samsung | 5402 | F: sound/soc/samsung |