Merge branch 'for-2.6.32' into for-2.6.33
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 6 Nov 2009 15:46:18 +0000 (15:46 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 6 Nov 2009 15:46:18 +0000 (15:46 +0000)
commit330f28f691e9b349e34adcaf82b273cf061bb491
treefca3bfe41eff25ef19f576cef1979c68f6521af5
parentfe3e78e073d25308756f38019956061153267769
parent6fc786d5034ed7ce2d43c459211137de6d99dd28
Merge branch 'for-2.6.32' into for-2.6.33
arch/arm/mach-omap2/board-3430sdp.c
arch/arm/mach-omap2/board-omap3evm.c
arch/arm/mach-omap2/board-omap3pandora.c
arch/arm/mach-omap2/board-zoom2.c
drivers/mfd/twl4030-core.c
include/linux/i2c/twl4030.h
sound/soc/s3c24xx/s3c24xx-pcm.c
sound/soc/s3c24xx/s3c64xx-i2s.c