diff options
125 files changed, 4751 insertions, 4580 deletions
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 97a76eea7389..55cfff9d59bb 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt | |||
| @@ -2548,6 +2548,9 @@ | |||
| 2548 | 2548 | ||
| 2549 | noalign [KNL,ARM] | 2549 | noalign [KNL,ARM] |
| 2550 | 2550 | ||
| 2551 | noaltinstr [S390] Disables alternative instructions patching | ||
| 2552 | (CPU alternatives feature). | ||
| 2553 | |||
| 2551 | noapic [SMP,APIC] Tells the kernel to not make use of any | 2554 | noapic [SMP,APIC] Tells the kernel to not make use of any |
| 2552 | IOAPICs that may be present in the system. | 2555 | IOAPICs that may be present in the system. |
| 2553 | 2556 | ||
diff --git a/MAINTAINERS b/MAINTAINERS index 026644adfd8f..082679a4bcc2 100644 --- a/ | |||