summaryrefslogtreecommitdiffstats
path: root/Documentation/feature-removal-schedule.txt
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/feature-removal-schedule.txt')
-rw-r--r--Documentation/feature-removal-schedule.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 1a0fc32bc205..40a9c3239319 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -647,3 +647,10 @@ Who: Stefan Richter <stefanr@s5r6.in-berlin.de>
----------------------------
+What: The acpi_sleep=s4_nonvs command line option
+When: 2.6.37
+Files: arch/x86/kernel/acpi/sleep.c
+Why: superseded by acpi_sleep=nonvs
+Who: Rafael J. Wysocki <rjw@sisk.pl>
+
+----------------------------