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

Conflicts:
	MAINTAINERS

diff --cc MAINTAINERS
index fa2a16def17afb765ad447f10b5dde634f83ded9,a20ac54f02501fd7d89d33617cf91b1f82447dff..3ba68dc9fe48d4c472271581b82c30494ce01290
--- 1/MAINTAINERS
--- 2/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