From: Takashi Iwai Date: Thu, 25 Jun 2009 13:28:14 +0000 (+0200) Subject: Merge branch 'for-2.6.31' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie... X-Git-Tag: v2.6.31-rc2~66^2~7 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=10121a12e2380fb34b6e646a8e367add06d036c3 Merge branch 'for-2.6.31' of git://git./linux/kernel/git/broonie/sound-2.6 into fix/asoc Conflicts: MAINTAINERS --- 10121a12e2380fb34b6e646a8e367add06d036c3 diff --cc MAINTAINERS index fa2a16def17a,a20ac54f0250..3ba68dc9fe48 --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -5668,6 -5509,27 +5668,13 @@@ F: drivers/misc/tifm F: drivers/mmc/host/tifm_sd.c F: include/linux/tifm.h -TI OMAP MMC INTERFACE DRIVER -P: Carlos Aguiar, Anderson Briglia and Syed Khasim -M: linux-omap@vger.kernel.org -W: http://linux.omap.com -W: http://www.muru.com/linux/omap/ -S: Maintained -F: drivers/mmc/host/omap.c - -TI OMAP RANDOM NUMBER GENERATOR SUPPORT -P: Deepak Saxena -M: dsaxena@plexity.net -S: Maintained -F: drivers/char/hw_random/omap-rng.c - + 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