From: Andrew Morton Signed-off-by: Andrew Morton --- Documentation/kernel-parameters.txt | 3 --- 1 file changed, 3 deletions(-) diff -puN Documentation/kernel-parameters.txt~git-libata-all-fixup Documentation/kernel-parameters.txt --- a/Documentation/kernel-parameters.txt~git-libata-all-fixup +++ a/Documentation/kernel-parameters.txt @@ -1027,17 +1027,14 @@ and is between 256 and 4096 characters. emulation library even if a 387 maths coprocessor is present. -<<<<<<< HEAD/Documentation/kernel-parameters.txt noaliencache [MM, NUMA] Disables the allcoation of alien caches in the slab allocator. Saves per-node memory, but will impact performance on real NUMA hardware. -======= noacpi [LIBATA] Disables use of ACPI in libata suspend/resume when set. Format: ->>>>>>> /Documentation/kernel-parameters.txt noalign [KNL,ARM] noapic [SMP,APIC] Tells the kernel to not make use of any _