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

…ie/sound-2.6 into fix/asoc Conflicts: MAINTAINERS

Merge branch 'for-2.6.31' of git://git.kernel.org/pub/scm/linux/kernel/git/broon…
…ie/sound-2.6 into fix/asoc Conflicts: MAINTAINERS
Takashi Iwai
2 parents 28d0325ce6 dd5e8e6b1d
Showing 1 changed file Side-by-side Diff
MAINTAINERS
@@ -5668,6 +5668,13 @@
 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
...	...	@@ -5668,6 +5668,13 @@
5668	5668	F: drivers/mmc/host/tifm_sd.c
5669	5669	F: include/linux/tifm.h
5670	5670
	5671	+TI TWL4030 SERIES SOC CODEC DRIVER
	5672	+P: Peter Ujfalusi
	5673	+M: peter.ujfalusi@nokia.com
	5674	+L: alsa-devel@alsa-project.org (moderated for non-subscribers)
	5675	+S: Maintained
	5676	+F: sound/soc/codecs/twl4030*
	5677	+
5671	5678	TIPC NETWORK LAYER
5672	5679	P: Per Liden
5673	5680	M: per.liden@ericsson.com