summaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-01-13 08:37:24 +0100
committerTakashi Iwai <tiwai@suse.de>2011-01-13 08:37:24 +0100
commit6db9a0f326d3144d790d9479309df480a8f562e4 (patch)
tree650a8950c35c087278ecee1b8d123f75f601ebc8 /MAINTAINERS
parentc400c9e23feb5bb3fbe8a8d4581ecce3b19a2f38 (diff)
parent18b022eb117e7f70c191267551ff865f278a9258 (diff)
downloadlinux-3.10-6db9a0f326d3144d790d9479309df480a8f562e4.tar.gz
linux-3.10-6db9a0f326d3144d790d9479309df480a8f562e4.tar.bz2
linux-3.10-6db9a0f326d3144d790d9479309df480a8f562e4.zip
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS2
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index af58f0b0145..be9c708aac7 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5176,7 +5176,7 @@ 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
+F: sound/soc/samsung
TLG2300 VIDEO4LINUX-2 DRIVER
M: Huang Shijie <shijie8@gmail.com>