diff --git a/[refs] b/[refs]
index a7925fe0d69e..5d1c0bea3d23 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1415d160c7f7fe8f1026735d5b6cc19aec7a367f
+refs/heads/master: 5d570cbbf25a62e9c077f5b351fb142dbfc67288
diff --git a/trunk/include/asm-x86/nops.h b/trunk/include/asm-x86/nops.h
index b3930ae539b3..ad0bedd10b89 100644
--- a/trunk/include/asm-x86/nops.h
+++ b/trunk/include/asm-x86/nops.h
@@ -5,6 +5,8 @@
 
 /* generic versions from gas
    1: nop
+   the following instructions are NOT nops in 64-bit mode,
+   for 64-bit mode use K8 or P6 nops instead
    2: movl %esi,%esi
    3: leal 0x00(%esi),%esi
    4: leal 0x00(,%esi,1),%esi