diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-01-13 02:37:24 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-01-13 02:37:24 -0500 |
| commit | 6db9a0f326d3144d790d9479309df480a8f562e4 (patch) | |
| tree | 650a8950c35c087278ecee1b8d123f75f601ebc8 /MAINTAINERS | |
| parent | c400c9e23feb5bb3fbe8a8d4581ecce3b19a2f38 (diff) | |
| parent | 18b022eb117e7f70c191267551ff865f278a9258 (diff) | |
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index af58f0b01450..be9c708aac78 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -5176,7 +5176,7 @@ SAMSUNG AUDIO (ASoC) DRIVERS | |||
| 5176 | M: Jassi Brar <jassi.brar@samsung.com> | 5176 | M: Jassi Brar <jassi.brar@samsung.com> |
| 5177 | L: alsa-devel@alsa-project.org (moderated for non-subscribers) | 5177 | L: alsa-devel@alsa-project.org (moderated for non-subscribers) |
| 5178 | S: Supported | 5178 | S: Supported |
| 5179 | F: sound/soc/s3c24xx | 5179 | F: sound/soc/samsung |
| 5180 | 5180 | ||
| 5181 | TLG2300 VIDEO4LINUX-2 DRIVER | 5181 | TLG2300 VIDEO4LINUX-2 DRIVER |
| 5182 | M: Huang Shijie <shijie8@gmail.com> | 5182 | M: Huang Shijie <shijie8@gmail.com> |