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)
commitbf564ea99797f6e66796d0d0a24a8fe872d5f26e
treeeb39d79c3ab5d59817b7d886c584b91c1651b480
parent147dfe90f7302f2472d83c25b983420a727aec5a
parent0cd114fff9ace7014c0d3ef8ab385fc5d3cf2d2f
Merge branch 'for-3.0' into for-3.1
sound/soc/fsl/fsl_dma.c