Merge branch 'for-2.6.32' into for-2.6.33

diff --cc arch/arm/mach-omap2/board-3430sdp.c
Simple merge

diff --cc arch/arm/mach-omap2/board-omap3evm.c
Simple merge

diff --cc arch/arm/mach-omap2/board-omap3pandora.c
Simple merge

diff --cc arch/arm/mach-omap2/board-zoom2.c
Simple merge

diff --cc drivers/mfd/twl4030-core.c
Simple merge

diff --cc include/linux/i2c/twl4030.h
Simple merge

diff --cc sound/soc/s3c24xx/s3c24xx-pcm.c
Simple merge

diff --cc sound/soc/s3c24xx/s3c64xx-i2s.c
Simple merge