diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-08-12 12:26:38 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-08-12 12:26:38 -0400 |
| commit | c012cdc858db36ff2314469930bfcfb00eef6f29 (patch) | |
| tree | 6038ccd1dec55f82642f6036a75af57cb6b2a921 /MAINTAINERS | |
| parent | 15439bde3af7ff88459ea2b5520b77312e958df2 (diff) | |
| parent | f6b864a9071e21186476910613ec9913b56067a2 (diff) | |
Merge branch 'fix/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 51d42fbc8dc4..46e3e6b99220 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -4604,7 +4604,7 @@ F: arch/arm/mach-omap2/clockdomain2xxx_3xxx.c | |||
| 4604 | F: arch/arm/mach-omap2/clockdomain44xx.c | 4604 | F: arch/arm/mach-omap2/clockdomain44xx.c |
| 4605 | 4605 | ||
| 4606 | OMAP AUDIO SUPPORT | 4606 | OMAP AUDIO SUPPORT |
| 4607 | M: Jarkko Nikula <jhnikula@gmail.com> | 4607 | M: Jarkko Nikula <jarkko.nikula@bitmer.com> |
| 4608 | L: alsa-devel@alsa-project.org (subscribers-only) | 4608 | L: alsa-devel@alsa-project.org (subscribers-only) |
| 4609 | L: linux-omap@vger.kernel.org | 4609 | L: linux-omap@vger.kernel.org |
| 4610 | S: Maintained | 4610 | S: Maintained |