diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-09-25 04:15:39 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-09-25 04:15:39 -0400 |
| commit | 35e60448b98be847a7066134442789222a1916ea (patch) | |
| tree | 392200eb8d72e3465735aeaa1f56e14a4129a47a | |
| parent | fc38a8a11d332549e4de0537ba34f197cf42788b (diff) | |
| parent | 4a109cc0511209276e58f1dbe53259e7a8f1508b (diff) | |
Merge branch 'for-2.6.36' into for-2.6.37
| -rw-r--r-- | MAINTAINERS | 6 |
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* | |||
| 4965 | F: drivers/media/video/*7146* | 4965 | F: drivers/media/video/*7146* |
| 4966 | F: include/media/*7146* | 4966 | F: include/media/*7146* |
| 4967 | 4967 | ||
| 4968 | SAMSUNG AUDIO (ASoC) DRIVERS | ||
| 4969 | M: Jassi Brar <jassi.brar@samsung.com> | ||
| 4970 | L: alsa-devel@alsa-project.org (moderated for non-subscribers) | ||
| 4971 | S: Supported | ||
| 4972 | F: sound/soc/s3c24xx | ||
| 4973 | |||
| 4968 | TLG2300 VIDEO4LINUX-2 DRIVER | 4974 | TLG2300 VIDEO4LINUX-2 DRIVER |
| 4969 | M: Huang Shijie <shijie8@gmail.com> | 4975 | M: Huang Shijie <shijie8@gmail.com> |
| 4970 | M: Kang Yong <kangyong@telegent.com> | 4976 | M: Kang Yong <kangyong@telegent.com> |