Merge branch 'for-2.6.31' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
Takashi Iwai [Thu, 25 Jun 2009 13:28:14 +0000 (15:28 +0200)]
Conflicts:
MAINTAINERS

1  2 
MAINTAINERS

diff --cc 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