---

yaml --- r: 215995 b: refs/heads/master c: bbff216 h: refs/heads/master i: 215993: 11ea54f 215991: de1619d v: v3
git-mirror · Aug 16, 2010 · d89af4d · d89af4d
1 parent 1c7045d
commit d89af4d
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: 6396fc3b3ff3f6b942992b653a62df11dcef9bea
+refs/heads/master: bbff2168c1088995753e889580c756971eca51e4
diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt
@@ -1777,7 +1777,7 @@ and is between 256 and 4096 characters. It is defined in the file
 	norandmaps	Don't use address space randomization.  Equivalent to
 			echo 0 > /proc/sys/kernel/randomize_va_space
 
-	noreplace-paravirt	[X86-32,PV_OPS] Don't patch paravirt_ops
+	noreplace-paravirt	[X86,IA-64,PV_OPS] Don't patch paravirt_ops
 
 	noreplace-smp	[X86-32,SMP] Don't replace SMP instructions
 			with UP alternatives