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

Commit f3853863 authored by Andi Kleen's avatar Andi Kleen
Browse files

Merge branch 'compal-fix' into release-2.6.27

parents 613e5f33 79c4375b

drivers/acpi/processor_core.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -138,7 +138,7 @@ static struct dmi_system_id __cpuinitdata processor_idle_dmi_table[] = { 
	{

	{

	set_no_mwait, "Extensa 5220", {

	set_no_mwait, "Extensa 5220", {

	DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies LTD"),

	DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies LTD"),

	DMI_MATCH(DMI_SYS_VENDOR, "ACER"),

	DMI_MATCH(DMI_SYS_VENDOR, "Acer"),

	DMI_MATCH(DMI_PRODUCT_VERSION, "0100"),

	DMI_MATCH(DMI_PRODUCT_VERSION, "0100"),

	DMI_MATCH(DMI_BOARD_NAME, "Columbia") }, NULL},

	DMI_MATCH(DMI_BOARD_NAME, "Columbia") }, NULL},

	{},

	{},