Merge branch 'next' into for-linus

1 files changed, 7 insertions, 12 deletions

diff --git a/Documentation/x86/x86_64/boot-options.txt b/Documentation/x86/x86_64/boot-options.txt
index 7fbbaf85f5b7..092e596a1301 100644
--- a/Documentation/x86/x86_64/boot-options.txt
+++ b/Documentation/x86/x86_64/boot-options.txt
@@ -189,13 +189,13 @@ ACPI
 
 PCI
 
-  pci=off       Don't use PCI
-  pci=conf1     Use conf1 access.
-  pci=conf2     Use conf2 access.
-  pci=rom       Assign ROMs.
-  pci=assign-busses    Assign busses
-  pci=irqmask=MASK             Set PCI interrupt mask to MASK
-  pci=lastbus=NUMBER           Scan upto NUMBER busses, no matter what the mptable says.
+  pci=off               Don't use PCI
+  pci=conf1             Use conf1 access.
+  pci=conf2             Use conf2 access.
+  pci=rom               Assign ROMs.
+  pci=assign-busses     Assign busses
+  pci=irqmask=MASK      Set PCI interrupt mask to MASK
+  pci=lastbus=NUMBER    Scan up to NUMBER busses, no matter what the mptable says.
   pci=noacpi            Don't use ACPI to set up PCI interrupt routing.
 
 IOMMU (input/output memory management unit)
@@ -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