Merge branch 'for-2.6.38' into for-2.6.39

Conflicts:
	sound/soc/codecs/wm8978.c
	sound/soc/soc-dapm.c

diff --cc sound/soc/soc-dapm.c
index e981a83,1790f83..81c4052
--- 1/sound/soc/soc-dapm.c
--- 2/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@@ -1007,14 -941,7 +1007,14 @@@ static void dapm_seq_run(struct snd_soc
        }
  
        if (!list_empty(&pending))
-               dapm_seq_run_coalesced(dapm, &pending);
+               dapm_seq_run_coalesced(cur_dapm, &pending);
 +
 +      if (cur_dapm && cur_dapm->seq_notifier) {
 +              for (i = 0; i < ARRAY_SIZE(dapm_up_seq); i++)
 +                      if (sort[i] == cur_sort)
 +                              cur_dapm->seq_notifier(cur_dapm,
 +                                                     i, cur_subseq);
 +      }
  }
  
  static void dapm_widget_update(struct snd_soc_dapm_context *dapm)