diff options
author | Takashi Iwai <tiwai@suse.de> | 2008-12-25 05:40:25 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2008-12-25 05:40:25 -0500 |
commit | 5c8261e44eaebbc91f9fc1bbd3f3167e91a50a57 (patch) | |
tree | 6b932687edc73c07e544ccba3f0130fdb257d902 /MAINTAINERS | |
parent | facef8685b3ff95c01c33d9d836401d0dd26211d (diff) | |
parent | 472346da9cc4231bec03ff2032e0d5fd4037232c (diff) |
Merge branch 'topic/asoc' into to-push
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index fbc8fa58d56d..701025701514 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -3977,7 +3977,7 @@ M: tiwai@suse.de | |||
3977 | L: alsa-devel@alsa-project.org (subscribers-only) | 3977 | L: alsa-devel@alsa-project.org (subscribers-only) |
3978 | S: Maintained | 3978 | S: Maintained |
3979 | 3979 | ||
3980 | SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT | 3980 | SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC) |
3981 | P: Liam Girdwood | 3981 | P: Liam Girdwood |
3982 | M: lrg@slimlogic.co.uk | 3982 | M: lrg@slimlogic.co.uk |
3983 | P: Mark Brown | 3983 | P: Mark Brown |