Pull misc into release branch
Conflicts: Documentation/feature-removal-schedule.txt
This commit is contained in:
@@ -984,14 +984,6 @@ static struct dmi_system_id __initdata acpi_dmi_table[] = {
|
||||
DMI_MATCH(DMI_PRODUCT_NAME, "PRIMERGY T850"),
|
||||
},
|
||||
},
|
||||
{
|
||||
.callback = force_acpi_ht,
|
||||
.ident = "DELL GX240",
|
||||
.matches = {
|
||||
DMI_MATCH(DMI_BOARD_VENDOR, "Dell Computer Corporation"),
|
||||
DMI_MATCH(DMI_BOARD_NAME, "OptiPlex GX240"),
|
||||
},
|
||||
},
|
||||
{
|
||||
.callback = force_acpi_ht,
|
||||
.ident = "HP VISUALIZE NT Workstation",
|
||||
|
Reference in New Issue
Block a user