Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

1 files changed, 16 insertions, 0 deletions

diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index 519266654f06..00456fccfa38 100644
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -378,6 +378,22 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = {
                 DMI_MATCH(DMI_PRODUCT_NAME, "Macmini1,1"),
                 },
         },
+        {
+        .callback = init_old_suspend_ordering,
+        .ident = "Asus Pundit P1-AH2 (M2N8L motherboard)",
+        .matches = {
+                DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTek Computer INC."),
+                DMI_MATCH(DMI_BOARD_NAME, "M2N8L"),
+                },
+        },
+        {
+        .callback = init_set_sci_en_on_resume,
+        .ident = "Toshiba Satellite L300",
+        .matches = {
+                DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
+                DMI_MATCH(DMI_PRODUCT_NAME, "Satellite L300"),
+                },
+        },
         {},
 };
 #endif /* CONFIG_SUSPEND */