Merge branch 'for-2.6.37' into for-2.6.38
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 25 Nov 2010 11:17:24 +0000 (11:17 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 25 Nov 2010 11:17:24 +0000 (11:17 +0000)
commit2c54c1586c78775cfdfb071e68b27e14b668921f
treecf57390a0b82d2bd1ade5e5356434c66c39af38a
parentb26bb71f610f9b346203bff407e4278d98f9fe80
parent8b6b30ab665d3bbb23180c39f6215e6f64516ed0
Merge branch 'for-2.6.37' into for-2.6.38
sound/soc/atmel/sam9g20_wm8731.c
sound/soc/atmel/snd-soc-afeb9260.c
sound/soc/imx/imx-ssi.c
sound/soc/imx/phycore-ac97.c