]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Merge branch 'bugzilla-23002' into release
authorLen Brown <len.brown@intel.com>
Tue, 14 Dec 2010 03:40:54 +0000 (22:40 -0500)
committerLen Brown <len.brown@intel.com>
Tue, 14 Dec 2010 03:40:54 +0000 (22:40 -0500)
drivers/acpi/sleep.c

index 2182c5579230d3e92031ed5fef82f43a9dd5a23b..febb153b5a68cf216fdd1b528ac44159e73abcba 100644 (file)
@@ -427,6 +427,14 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = {
                DMI_MATCH(DMI_PRODUCT_NAME, "VPCEB1Z1E"),
                },
        },
+       {
+       .callback = init_nvs_nosave,
+       .ident = "Sony Vaio VGN-NW130D",
+       .matches = {
+               DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
+               DMI_MATCH(DMI_PRODUCT_NAME, "VGN-NW130D"),
+               },
+       },
        {},
 };
 #endif /* CONFIG_SUSPEND */