summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-09-25 09:15:39 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-09-25 09:15:39 +0100
commit35e60448b98be847a7066134442789222a1916ea (patch)
tree392200eb8d72e3465735aeaa1f56e14a4129a47a
parentfc38a8a11d332549e4de0537ba34f197cf42788b (diff)
parent4a109cc0511209276e58f1dbe53259e7a8f1508b (diff)
Merge branch 'for-2.6.36' into for-2.6.37
-rw-r--r--MAINTAINERS6
1 files changed, 6 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index b5b8baa1d70e..f51409b1527a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4965,6 +4965,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>