Merge branches 'x86/amd', 'x86/vt-d', 'arm/exynos', 'arm/mediatek' and 'arm/renesas...

diff --combined Documentation/kernel-parameters.txt
index 748ef7bdd64d7d4d4d1a6be64b0b2b1c4946c3b9,a4f4d693e2c1287d533c0bc05d9f292f9b529720,46c030a49186faabaa588afd2d284975c72c2017,46c030a49186faabaa588afd2d284975c72c2017,a4f4d693e2c1287d533c0bc05d9f292f9b529720..53b72020931a6ee53e75bb07ccba3c720b474446
--- 1/Documentation/kernel-parameters.txt
--- 2/Documentation/kernel-parameters.txt
--- 3/Documentation/kernel-parameters.txt
--- 4/Documentation/kernel-parameters.txt
--- 5/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@@@@ -460,15 -460,6 -460,6 -460,6 -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>
@@@@@@ -3041,6 -3032,10 -3032,6 -3032,6 -3032,10 +3041,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