Browse Source

Merge branch 'for-2.6.36' into for-2.6.37

Mark Brown 15 years ago
parent
commit
35e60448b9
1 changed files with 6 additions and 0 deletions
  1. 6 0
      MAINTAINERS

+ 6 - 0
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>