aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2008-12-25 11:40:25 +0100
committerTakashi Iwai <tiwai@suse.de>2008-12-25 11:40:25 +0100
commit5c8261e44eaebbc91f9fc1bbd3f3167e91a50a57 (patch)
tree6b932687edc73c07e544ccba3f0130fdb257d902 /MAINTAINERS
parentfacef8685b3ff95c01c33d9d836401d0dd26211d (diff)
parent472346da9cc4231bec03ff2032e0d5fd4037232c (diff)
downloadkernel_samsung_aries-5c8261e44eaebbc91f9fc1bbd3f3167e91a50a57.zip
kernel_samsung_aries-5c8261e44eaebbc91f9fc1bbd3f3167e91a50a57.tar.gz
kernel_samsung_aries-5c8261e44eaebbc91f9fc1bbd3f3167e91a50a57.tar.bz2
Merge branch 'topic/asoc' into to-push
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS2
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index fbc8fa5..7010257 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3977,7 +3977,7 @@ M: tiwai@suse.de
L: alsa-devel@alsa-project.org (subscribers-only)
S: Maintained
-SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT
+SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC)
P: Liam Girdwood
M: lrg@slimlogic.co.uk
P: Mark Brown