projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' into for-next
[firefly-linux-kernel-4.4.55.git]
/
Documentation
/
feature-removal-schedule.txt
diff --git
a/Documentation/feature-removal-schedule.txt
b/Documentation/feature-removal-schedule.txt
index 1a0fc32bc2050abbe9ecefca7e62407690bd0e87..40a9c323931905a99447f90084584eb7eb420128 100644
(file)
--- 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>
+
+----------------------------