Merge branch 'for-2.6.34' into for-2.6.35
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 22 Mar 2010 17:23:46 +0000 (17:23 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 22 Mar 2010 17:23:46 +0000 (17:23 +0000)
commit74511020dde10252f8b8e648690d99dba721de14
tree04fc22bc7dd5d5b8d9294b2e57985b093858bd84
parent69266866a5790080d7fe80094b28d670ff8aa765
parent3cc4e53f86dab635166929bfa47cc68d59b28c26
Merge branch 'for-2.6.34' into for-2.6.35
arch/arm/plat-omap/mcbsp.c
drivers/mfd/Kconfig
sound/soc/imx/Kconfig
sound/soc/pxa/pxa-ssp.c
sound/soc/s3c24xx/s3c64xx-i2s.c