tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

ACPI: fix git automerge failure

Signed-off-by: Len Brown <len.brown@intel.com>

Len Brown 7e244322 463e7c7c

-1
unified split
-1
arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
··· 569 return 0; 570 } 571 572 - #ifdef CONFIG_SMP 573 static struct dmi_system_id sw_any_bug_dmi_table[] = { 574 { 575 .callback = sw_any_bug_found,
··· 569 return 0; 570 } 571 572 static struct dmi_system_id sw_any_bug_dmi_table[] = { 573 { 574 .callback = sw_any_bug_found,