Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable

[pandora-kernel.git] / Documentation / x86 / x86_64 / boot-options.txt

diff --git a/Documentation/x86/x86_64/boot-options.txt b/Documentation/x86/x86_64/boot-options.txt
index 48c13b8..092e596 100644 (file)
--- a/Documentation/x86/x86_64/boot-options.txt
+++ b/Documentation/x86/x86_64/boot-options.txt
@@ -293,11 +293,6 @@ IOMMU (input/output memory management unit)
 
 Debugging
 
-  oops=panic   Always panic on oopses. Default is to just kill the process,
-               but there is a small probability of deadlocking the machine.
-               This will also cause panics on machine check exceptions.
-               Useful together with panic=30 to trigger a reboot.
-
   kstack=N     Print N words from the kernel stack in oops dumps.
 
   pagefaulttrace  Dump all page faults. Only useful for extreme debugging