From a8748144baa0abb49d96c4510b39554b862b3f6e Mon Sep 17 00:00:00 2001
From: Jiri Kosina <jkosina@suse.cz>
Date: Thu, 3 Jul 2008 10:45:38 -0400
Subject: [PATCH] --- yaml --- r: 104212 b: refs/heads/master c:
 0376bce7b0659fe1e80d045860087072583ab93f h: refs/heads/master v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/input/serio/i8042-x86ia64io.h | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 95b9ff92ae9c..32c316e4a8d9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fa14f7e8df9ee8afea23dab21adb0b7a521f1cd6
+refs/heads/master: 0376bce7b0659fe1e80d045860087072583ab93f
diff --git a/trunk/drivers/input/serio/i8042-x86ia64io.h b/trunk/drivers/input/serio/i8042-x86ia64io.h
index 9818359d26e2..876b3b0fd09c 100644
--- a/trunk/drivers/input/serio/i8042-x86ia64io.h
+++ b/trunk/drivers/input/serio/i8042-x86ia64io.h
@@ -291,6 +291,13 @@ static struct dmi_system_id __initdata i8042_dmi_nomux_table[] = {
 			DMI_MATCH(DMI_PRODUCT_VERSION, "3000 N100"),
 		},
 	},
+	{
+		.ident = "Acer Aspire 1360",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 1360"),
+		},
+	},
 	{ }
 };