diff --git a/[refs] b/[refs]
index d4383ef5c0fc..ab40d23d6cdc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 197e2eabc90c203d1086916b7f66694ba5fbb937
+refs/heads/master: fc06b8520b3bf9aaeb2e27debe6719c215bd4916
diff --git a/trunk/arch/x86/include/asm/nops.h b/trunk/arch/x86/include/asm/nops.h
index ad2668ee1aa7..6d8723a766cc 100644
--- a/trunk/arch/x86/include/asm/nops.h
+++ b/trunk/arch/x86/include/asm/nops.h
@@ -65,6 +65,8 @@
    6: osp nopl 0x00(%eax,%eax,1)
    7: nopl 0x00000000(%eax)
    8: nopl 0x00000000(%eax,%eax,1)
+   Note: All the above are assumed to be a single instruction.
+	There is kernel code that depends on this.
 */
 #define P6_NOP1	GENERIC_NOP1
 #define P6_NOP2	".byte 0x66,0x90\n"