Pārlūkot izejas kodu

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
Takashi Iwai 16 gadi atpakaļ
vecāks
revīzija
10121a12e2
1 mainītis faili ar 7 papildinājumiem un 0 dzēšanām
  1. 7 0
      MAINTAINERS

+ 7 - 0
MAINTAINERS

@@ -5668,6 +5668,13 @@ F:	drivers/misc/tifm*
 F:	drivers/mmc/host/tifm_sd.c
 F:	drivers/mmc/host/tifm_sd.c
 F:	include/linux/tifm.h
 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
 TIPC NETWORK LAYER
 P:	Per Liden
 P:	Per Liden
 M:	per.liden@ericsson.com
 M:	per.liden@ericsson.com