Merge branch 'for-3.1' into for-3.2
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 22 Aug 2011 22:33:01 +0000 (23:33 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 22 Aug 2011 22:33:01 +0000 (23:33 +0100)
commit09d930ae5198fbb67b86d3d058ad82211f469a46
treee11f0be409e9184a0764263116a72dc0100aaaa8
parent33c5f969b969c277e96cd9e9bf8472c4b8709c25
parentc09f5ca7bdc9a82c5f721bc28c46d65452240cfa
Merge branch 'for-3.1' into for-3.2
sound/soc/fsl/fsl_dma.c
sound/soc/soc-core.c