Merge branch 'for-2.6.32' into for-2.6.33

diff --cc sound/soc/codecs/wm8350.c
Simple merge

diff --cc sound/soc/codecs/wm8974.c
Simple merge

diff --cc sound/soc/s3c24xx/s3c-i2s-v2.c
Simple merge

diff --cc sound/soc/soc-dapm.c
index 37f7adeae323b45b14ae4d9a338435a91b8ba9a9,f79711b9fa5b9c58de8c156b30ff0e613bf26664..9babda559c92f897c8642065fb641721dfef55d4
--- 1/sound/soc/soc-dapm.c
--- 2/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@@ -1135,14 -1131,12 +1135,15 @@@ static ssize_t dapm_widget_power_read_f
        ret = snprintf(buf, PAGE_SIZE, "%s: %s  in %d out %d\n",
                       w->name, w->power ? "On" : "Off", in, out);
  
-       if (w->active && w->sname)
-               ret += snprintf(buf, PAGE_SIZE - ret, " stream %s active\n",
-                               w->sname);
+       if (w->sname)
+               ret += snprintf(buf + ret, PAGE_SIZE - ret, " stream %s %s\n",
+                               w->sname,
+                               w->active ? "active" : "inactive");
  
        list_for_each_entry(p, &w->sources, list_sink) {
 +              if (p->connected && !p->connected(w, p->sink))
 +                      continue;
 +
                if (p->connect)
                        ret += snprintf(buf + ret, PAGE_SIZE - ret,
                                        " in  %s %s\n",