Merge branch 'for-3.1' into for-3.2

diff --cc sound/soc/codecs/wm8994.c
index fb5c961,b393f9f..4487c5e
--- 1/sound/soc/codecs/wm8994.c
--- 2/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@@ -2980,9 -2978,10 +2980,10 @@@ static int wm8994_codec_probe(struct sn
                        wm8994->hubs.series_startup = 1;
                        break;
                default:
 -                      wm8994->hubs.dcs_readback_mode = 1;
 +                      wm8994->hubs.dcs_readback_mode = 2;
                        break;
                }
+               break;
  
        case WM8958:
                wm8994->hubs.dcs_readback_mode = 1;