Merge branch 'for-3.1' into for-3.2

diff --cc sound/soc/imx/imx-pcm-fiq.c
index ac790e87e231aba59a5116a5a43e8d4f59de16cf,7945625e0e087090d62948e0cacd14f2c792acea..c8527ead373626baf114e089f049169f3c23a06e
--- 1/sound/soc/imx/imx-pcm-fiq.c
--- 2/sound/soc/imx/imx-pcm-fiq.c
+++ b/sound/soc/imx/imx-pcm-fiq.c
@@@ -240,10 -240,8 +240,9 @@@ static int ssi_irq = 0
  
  static int imx_pcm_fiq_new(struct snd_soc_pcm_runtime *rtd)
  {
-       struct snd_card *card = rtd->card->snd_card;
        struct snd_soc_dai *dai = rtd->cpu_dai;
        struct snd_pcm *pcm = rtd->pcm;
 +      struct snd_pcm_substream *substream;
        int ret;
  
        ret = imx_pcm_new(rtd);