summaryrefslogtreecommitdiffstats
path: root/Documentation/x86_64
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-01-15 16:43:29 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-15 16:43:29 -0800
commit3f02d072d46bb409e8ca3cf16c0511f5c21adaf6 (patch)
treebaec074db38a5ceaaabbcee76f199acef43bb42a /Documentation/x86_64
parent0238cb4e7583c521bb3538060f98a73e65f61324 (diff)
parentfb453d4b0b51ea71c9eb8192c61b768afeb7ee8a (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
Diffstat (limited to 'Documentation/x86_64')
-rw-r--r--Documentation/x86_64/boot-options.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/x86_64/boot-options.txt b/Documentation/x86_64/boot-options.txt
index 72ab9b99b22..9c5fc15d03d 100644
--- a/Documentation/x86_64/boot-options.txt
+++ b/Documentation/x86_64/boot-options.txt
@@ -198,6 +198,6 @@ Debugging
Misc
- noreplacement Don't replace instructions with more appropiate ones
+ noreplacement Don't replace instructions with more appropriate ones
for the CPU. This may be useful on asymmetric MP systems
where some CPU have less capabilities than the others.