diff --git a/[refs] b/[refs]
index 716a7254344b..e7ef35c9abfc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2cbc9ee35c992f88fb2558a4f13920e3df4ef3bb
+refs/heads/master: 4855170f9876c8b4a16f115f32cf6851bac1ffcc
diff --git a/trunk/arch/x86_64/kernel/mce.c b/trunk/arch/x86_64/kernel/mce.c
index 281ad5f1f86a..b8f28ebdce26 100644
--- a/trunk/arch/x86_64/kernel/mce.c
+++ b/trunk/arch/x86_64/kernel/mce.c
@@ -92,6 +92,7 @@ void mce_log(struct mce *mce)
 static void print_mce(struct mce *m)
 {
 	printk(KERN_EMERG "\n"
+	       KERN_EMERG "HARDWARE ERROR\n"
 	       KERN_EMERG
 	       "CPU %d: Machine Check Exception: %16Lx Bank %d: %016Lx\n",
 	       m->cpu, m->mcgstatus, m->bank, m->status);
@@ -110,6 +111,9 @@ static void print_mce(struct mce *m)
 	if (m->misc)
 		printk("MISC %Lx ", m->misc); 	
 	printk("\n");
+	printk(KERN_EMERG "This is not a software problem!\n");
+        printk(KERN_EMERG
+    "Run through mcelog --ascii to decode and contact your hardware vendor\n");
 }
 
 static void mce_panic(char *msg, struct mce *backup, unsigned long start)