Merge branch 'for-2.6.31' of git://git.kernel.org/pub/scm/linux/kerne…

…l/git/broonie/sound-2.6 into fix/asoc Conflicts: MAINTAINERS
git-mirror · Jun 25, 2009 · 10121a1 · 10121a1
2 parents 28d0325 + dd5e8e6
commit 10121a1
Showing 1 changed file with 7 additions and 0 deletions.
diff --git 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