Merge branch 'linus' into x86/quirks

This commit is contained in:
Ingo Molnar
2008-12-08 15:07:49 +01:00
625 changed files with 11772 additions and 6817 deletions

View File

@@ -777,7 +777,7 @@ static struct dmi_system_id __initdata bad_bios_dmi_table[] = {
.callback = dmi_low_memory_corruption,
.ident = "Phoenix BIOS",
.matches = {
DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies, LTD"),
DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies"),
},
},
#endif