Merge branch 'for-3.1' into for-3.2
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 31 Aug 2011 08:57:44 +0000 (09:57 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 31 Aug 2011 08:57:44 +0000 (09:57 +0100)
commitefd614ac067a30b5541640e89d08f7afa7601f24
tree7cac6108a995a6cad696499f397bc6eb4ce1dfb4
parentda1c6ea6cf85544292c30295c70a89e8555358bc
parent117ef9570bf3a332eca443231f41dd3a52fcfb2c
Merge branch 'for-3.1' into for-3.2
sound/soc/imx/imx-pcm-fiq.c