Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	arch/microblaze/include/asm/socket.h

4 files changed, 45 insertions, 7 deletions

diff --git a/drivers/input/serio/hp_sdc_mlc.c b/drivers/input/serio/hp_sdc_mlc.c
index b587e2d576ac..820e51673b26 100644
--- a/drivers/input/serio/hp_sdc_mlc.c
+++ b/drivers/input/serio/hp_sdc_mlc.c
@@ -296,7 +296,7 @@ static void hp_sdc_mlc_out(hil_mlc *mlc)
         priv->tseq[3] = 0;
         if (mlc->opacket & HIL_CTRL_APE) {
                 priv->tseq[3] |= HP_SDC_LPC_APE_IPF;
-                down_trylock(&mlc->csem);
+                BUG_ON(down_trylock(&mlc->csem));
         }
  enqueue:
         hp_sdc_enqueue_transaction(&priv->trans);
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"),
+                },
+        },
         { }
 };
 
diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
index f919bf57293c..582245c497eb 100644
--- a/drivers/input/serio/i8042.c
+++ b/drivers/input/serio/i8042.c
@@ -934,10 +934,11 @@ static bool i8042_suspended;
 
 static int i8042_suspend(struct platform_device *dev, pm_message_t state)
 {
-        if (!i8042_suspended && state.event == PM_EVENT_SUSPEND) {
+        if (!i8042_suspended && state.event == PM_EVENT_SUSPEND)
                 i8042_controller_reset();
-                i8042_suspended = true;
-        }
+
+        i8042_suspended = state.event == PM_EVENT_SUSPEND ||
+                          state.event == PM_EVENT_FREEZE;
 
         return 0;
 }
diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
index fb17573f8f2d..d66f4944f2a0 100644
--- a/drivers/input/serio/serio.c
+++ b/drivers/input/serio/serio.c
@@ -935,10 +935,11 @@ static int serio_suspend(struct device *dev, pm_message_t state)
 {
         struct serio *serio = to_serio_port(dev);
 
-        if (!serio->suspended && state.event == PM_EVENT_SUSPEND) {
+        if (!serio->suspended && state.event == PM_EVENT_SUSPEND)
                 serio_cleanup(serio);
-                serio->suspended = true;
-        }
+
+        serio->suspended = state.event == PM_EVENT_SUSPEND ||
+                           state.event == PM_EVENT_FREEZE;
 
         return 0;
 }