commit 15086ded21ee7f065ad290c1edfdc49cf18cf96e

tjh.dev / kernel

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

fork atom

Merge branch 'for-2.6.38' into for-2.6.39

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

Mark Brown 15 years ago 15086ded 3e5ff4df

+1 -1

1 changed file

expand all

unified split

sound

soc

soc-dapm.c

+1 -1

sound/soc/soc-dapm.c

··· 1007 } 1008 1009 if (!list_empty(&pending)) 1010 - dapm_seq_run_coalesced(dapm, &pending); 1011 1012 if (cur_dapm && cur_dapm->seq_notifier) { 1013 for (i = 0; i < ARRAY_SIZE(dapm_up_seq); i++)

··· 1007 } 1008 1009 if (!list_empty(&pending)) 1010 + dapm_seq_run_coalesced(cur_dapm, &pending); 1011 1012 if (cur_dapm && cur_dapm->seq_notifier) { 1013 for (i = 0; i < ARRAY_SIZE(dapm_up_seq); i++)