aboutsummaryrefslogtreecommitdiff
path: root/sound/core/vmaster.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-04-13 18:09:20 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-13 18:09:20 -0700
commit1c98aa7424ff163637d8321674ec58dee28152d4 (patch)
tree144f554a3ba928fefa8097eec982870d15f32c9c /sound/core/vmaster.c
parent2e1c63b7ed36532b68f0eddd6a184d7ba1013b89 (diff)
Fix quilt merge error in acpi-cpufreq.c
We ended up incorrectly using '&cur' instead of '&readin' in the work_on_cpu() -> smp_call_function_single() transformation in commit 01599fca6758d2cd133e78f87426fc851c9ea725 ("cpufreq: use smp_call_function_[single|many]() in acpi-cpufreq.c"). Andrew explains: "OK, the acpi tree went and had conflicting changes merged into it after I'd written the patch and it appears that I incorrectly reverted part of 18b2646fe3babeb40b34a0c1751e0bf5adfdc64c while fixing the resulting rejects. Switching it to `readin' looks correct." Acked-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'sound/core/vmaster.c')
0 files changed, 0 insertions, 0 deletions