diff --git a/[refs] b/[refs] index c5751f15f7eb..53cbfc8f0876 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8997621bb2daaf19a4e9d82f118224159d8054e2 +refs/heads/master: 6c8111e9a0e73ef1e58a1bf0a10c23ee1512e7a2 diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt index aa47be71df4c..53800c2712e6 100644 --- a/trunk/Documentation/kernel-parameters.txt +++ b/trunk/Documentation/kernel-parameters.txt @@ -161,8 +161,6 @@ bytes respectively. Such letter suffixes can also be entirely omitted. rsdt -- prefer RSDT over (default) XSDT copy_dsdt -- copy DSDT to memory - See also Documentation/power/pm.txt, pci=noacpi - acpi_apic_instance= [ACPI, IOAPIC] Format: 2: use 2nd APIC table, if available