Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 15086ded authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-2.6.38' into for-2.6.39 

Conflicts:
	sound/soc/codecs/wm8978.c
	sound/soc/soc-dapm.c
parents 3e5ff4df 28e86808

sound/soc/soc-dapm.c

+1 −1
Original line number Diff line number Diff line
@@ -1007,7 +1007,7 @@ static void dapm_seq_run(struct snd_soc_dapm_context *dapm, 
	}



	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++)