Merge remote-tracking branch 'jc_docs/docs-next'

diff --combined Documentation/kernel-parameters.txt
index 8cfca14cff454dd54e4dcda91ead7f9c30cd4793,861f57514fbdddd7fbbefe5b24c4d5280a4cc2f1..73191f4fe5b6a41b9bee5ff08b336feea1f36817
--- 1/Documentation/kernel-parameters.txt
--- 2/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@ -460,15 -460,6 +460,15 @@@ bytes respectively. Such letter suffixe
                        driver will print ACPI tables for AMD IOMMU during
                        IOMMU initialization.
  
 +      amd_iommu_intr= [HW,X86-64]
 +                      Specifies one of the following AMD IOMMU interrupt
 +                      remapping modes:
 +                      legacy     - Use legacy interrupt remapping mode.
 +                      vapic      - Use virtual APIC mode, which allows IOMMU
 +                                   to inject interrupts directly into guest.
 +                                   This mode requires kvm-amd.avic=1.
 +                                   (Default when IOMMU HW support is present.)
 +
        amijoy.map=     [HW,JOY] Amiga joystick support
                        Map of devices attached to JOY0DAT and JOY1DAT
                        Format: <a>,<b>
@@@ -2583,8 -2574,6 +2583,6 @@@
  
        nodelayacct     [KNL] Disable per-task delay accounting
  
-       nodisconnect    [HW,SCSI,M68K] Disables SCSI disconnects.
- 
        nodsp           [SH] Disable hardware DSP at boot time.
  
        noefi           Disable EFI runtime services support.
@@@ -3047,10 -3036,6 +3045,10 @@@
                                PAGE_SIZE is used as alignment.
                                PCI-PCI bridge can be specified, if resource
                                windows need to be expanded.
 +                              To specify the alignment for several
 +                              instances of a device, the PCI vendor,
 +                              device, subvendor, and subdevice may be
 +                              specified, e.g., 4096@pci:8086:9c22:103c:198f
                ecrc=           Enable/disable PCIe ECRC (transaction layer
                                end-to-end CRC checking).
                                bios: Use BIOS/firmware settings. This is the
@@@ -3264,11 -3249,6 +3262,11 @@@
        raid=           [HW,RAID]
                        See Documentation/md.txt.
  
 +      ram_latent_entropy
 +                      Enable a very simple form of latent entropy extraction
 +                      from the first 4GB of memory as the bootmem allocator
 +                      passes the memory pages to the buddy allocator.
 +
        ramdisk_size=   [RAM] Sizes of RAM disks in kilobytes
                        See Documentation/blockdev/ramdisk.txt.