---

yaml --- r: 84155 b: refs/heads/master c: 8a681a4 h: refs/heads/master i: 84153: 1bdb634 84151: 6e07680 v: v3
git-mirror · Feb 7, 2008 · a4660e6 · a4660e6
1 parent 3c6e139
commit a4660e6
Show file tree

Hide file tree

Showing 77 changed files with 2,599 additions and 8,418 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 060195500e0347a6ba8ea89739a9898961eb6f2b
+refs/heads/master: 8a681a4dee07ea09aedaadc6a2da28d2131dc414
diff --git a/trunk/Documentation/00-INDEX b/trunk/Documentation/00-INDEX
@@ -14,7 +14,6 @@ Following translations are available on the WWW:
 	- this file.
 ABI/
 	- info on kernel <-> userspace ABI and relative interface stability.
-
 BUG-HUNTING
 	- brute force method of doing binary search of patches to find bug.
 Changes
@@ -67,8 +66,6 @@ VGA-softcursor.txt
 	- how to change your VGA cursor from a blinking underscore.
 accounting/
 	- documentation on accounting and taskstats.
-acpi/
-	- info on ACPI-specific hooks in the kernel.
 aoe/
 	- description of AoE (ATA over Ethernet) along with config examples.
 applying-patches.txt

diff --git a/trunk/Documentation/ABI/testing/sysfs-firmware-acpi b/trunk/Documentation/ABI/testing/sysfs-firmware-acpi
diff --git a/trunk/Documentation/acpi/method-tracing.txt b/trunk/Documentation/acpi/method-tracing.txt
diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt
@@ -147,10 +147,8 @@ and is between 256 and 4096 characters. It is defined in the file
 			default: 0
 
 	acpi_sleep=	[HW,ACPI] Sleep options
-			Format: { s3_bios, s3_mode, s3_beep }
-			See Documentation/power/video.txt for s3_bios and s3_mode.
-			s3_beep is for debugging; it makes the PC's speaker beep
-			as soon as the kernel's real-mode entry point is called.
+			Format: { s3_bios, s3_mode }
+			See Documentation/power/video.txt
 
 	acpi_sci=	[HW,ACPI] ACPI System Control Interrupt trigger mode
 			Format: { level | edge | high | low }

diff --git a/trunk/Documentation/power/swsusp.txt b/trunk/Documentation/power/swsusp.txt
@@ -386,11 +386,6 @@ before suspending; then remount them after resuming.
 There is a work-around for this problem.  For more information, see
 Documentation/usb/persist.txt.
 
-Q: Can I suspend-to-disk using a swap partition under LVM?
-
-A: No. You can suspend successfully, but you'll not be able to
-resume. uswsusp should be able to work with LVM. See suspend.sf.net.
-
 Q: I upgraded the kernel from 2.6.15 to 2.6.16. Both kernels were
 compiled with the similar configuration files. Anyway I found that
 suspend to disk (and resume) is much slower on 2.6.16 compared to