---

yaml --- r: 262292 b: refs/heads/master c: 6c8111e h: refs/heads/master v: v3
git-mirror · Aug 2, 2011 · 8f45fac · 8f45fac
1 parent e4e5acc
commit 8f45fac
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git 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
@@ -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: <int>
 			2: use 2nd APIC table, if available