diff --git a/[refs] b/[refs]
index 1668527a936f..3e1b518d941f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0d9d93c411c9351ba186f5ec910b10da7c1d9d14
+refs/heads/master: 8d04ddb64c7bf62aec1102fddc5336a68bcaebe9
diff --git a/trunk/drivers/input/serio/i8042.c b/trunk/drivers/input/serio/i8042.c
index ec195a36e8f6..ff40b5cbbf3f 100644
--- a/trunk/drivers/input/serio/i8042.c
+++ b/trunk/drivers/input/serio/i8042.c
@@ -761,6 +761,13 @@ static void i8042_controller_reset(void)
 {
 	i8042_flush();
 
+/*
+ * Disable both KBD and AUX interfaces so they don't get in the way
+ */
+
+	i8042_ctr |= I8042_CTR_KBDDIS | I8042_CTR_AUXDIS;
+	i8042_ctr &= ~(I8042_CTR_KBDINT | I8042_CTR_AUXINT);
+
 /*
  * Disable MUX mode if present.
  */