---

yaml --- r: 321338 b: refs/heads/master c: d6250a3 h: refs/heads/master v: v3
git-mirror · Jul 25, 2012 · 6b4df2e · 6b4df2e
1 parent 71ec23d
commit 6b4df2e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2a8ac745e3171889d364235b8203342e28526d2c
+refs/heads/master: d6250a3f12edb3a86db9598ffeca3de8b4a219e9
diff --git a/trunk/arch/x86/kernel/alternative.c b/trunk/arch/x86/kernel/alternative.c
@@ -219,7 +219,7 @@ void __init arch_init_ideal_nops(void)
 			ideal_nops = intel_nops;
 #endif
 		}
-
+		break;
 	default:
 #ifdef CONFIG_X86_64
 		ideal_nops = k8_nops;