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

1 files changed, 36 insertions, 0 deletions

diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
index fb8a3cd3ffd0..ae04d8a494e5 100644
--- a/drivers/input/serio/i8042-x86ia64io.h
+++ b/drivers/input/serio/i8042-x86ia64io.h
@@ -78,6 +78,14 @@ static struct dmi_system_id __initdata i8042_dmi_noloop_table[] = {
                 },
         },
         {
+                .ident = "ASUS G1S",
+                .matches = {
+                        DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer Inc."),
+                        DMI_MATCH(DMI_BOARD_NAME, "G1S"),
+                        DMI_MATCH(DMI_BOARD_VERSION, "1.0"),
+                },
+        },
+        {
                 /* AUX LOOP command does not raise AUX IRQ */
                 .ident = "ASUS P65UP5",
                 .matches = {
@@ -392,6 +400,34 @@ static struct dmi_system_id __initdata i8042_dmi_reset_table[] = {
                         DMI_MATCH(DMI_BOARD_VENDOR, "LG Electronics Inc."),
                 },
         },
+        {
+                .ident = "Acer Aspire One 150",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "AOA150"),
+                },
+        },
+        {
+                .ident = "Advent 4211",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "DIXONSXP"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Advent 4211"),
+                },
+        },
+        {
+                .ident = "Medion Akoya Mini E1210",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "MEDION"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "E1210"),
+                },
+        },
+        {
+                .ident = "Mivvy M310",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "VIOOO"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "N10"),
+                },
+        },
         { }
 };