From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed, 9 Mar 2011 12:37:42 +0000 (+0000)
Subject: Merge branch 'for-2.6.38' into for-2.6.39
X-Git-Tag: v2.6.39-rc1~200^2^2~14
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=15086ded21ee7f065ad290c1edfdc49cf18cf96e;p=~emulex%2Finfiniband.git

Merge branch 'for-2.6.38' into for-2.6.39

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

15086ded21ee7f065ad290c1edfdc49cf18cf96e
diff --cc sound/soc/soc-dapm.c
index e981a8339f8,1790f83ee66..81c4052c127
--- a/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)