aboutsummaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-06-25 15:28:14 +0200
committerTakashi Iwai <tiwai@suse.de>2009-06-25 15:28:14 +0200
commit10121a12e2380fb34b6e646a8e367add06d036c3 (patch)
treed500294174e67cbb208eaf5d7f9741be48eca8a6 /MAINTAINERS
parent28d0325ce6e0a52f53d8af687e6427fee59004d3 (diff)
parentdd5e8e6b1d4c218d2bafe002231ec460459ab5c4 (diff)
downloadvexpress-lsk-10121a12e2380fb34b6e646a8e367add06d036c3.tar.gz
Merge branch 'for-2.6.31' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into fix/asoc
Conflicts: MAINTAINERS
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS7
1 files changed, 7 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index fa2a16def17..3ba68dc9fe4 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5668,6 +5668,13 @@ F: drivers/misc/tifm*
F: drivers/mmc/host/tifm_sd.c
F: include/linux/tifm.h
+TI TWL4030 SERIES SOC CODEC DRIVER
+P: Peter Ujfalusi
+M: peter.ujfalusi@nokia.com
+L: alsa-devel@alsa-project.org (moderated for non-subscribers)
+S: Maintained
+F: sound/soc/codecs/twl4030*
+
TIPC NETWORK LAYER
P: Per Liden
M: per.liden@ericsson.com