Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 10121a12 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-2.6.31' of... 

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
parents 28d0325c dd5e8e6b

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -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