Merge branch 'for-3.0' into for-3.1
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 9 Jun 2011 11:02:26 +0000 (12:02 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 9 Jun 2011 11:02:26 +0000 (12:02 +0100)
1  2 
sound/soc/fsl/fsl_dma.c

Simple merge